home *** CD-ROM | disk | FTP | other *** search
| Emacs Compiled Lisp | 1998-05-21 | 27.2 KB |
open in: 
MacOS 8.1
|
Win98
|
DOS
view JSON data
|
view as text
This file was processed as: Emacs Compiled Lisp
(other/emacsCompiledLisp).
This format is not currently supported by dexvert.
| Confidence | Program | Detection | Match Type | Support
|
|---|
| 1%
| dexvert
| Emacs Compiled Lisp (other/emacsCompiledLisp)
| magic
| Unsupported |
| 100%
| file
| Emacs/XEmacs v20 byte-compiled Lisp data
| default
| |
| 99%
| file
| data
| default
| |
| 100%
| TrID
| Emacs/XEmacs byte-compiled Lisp (generic)
| default
|
|
hex view+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 14 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 6a 75 73 74 69 6e 62 |piled by| justinb|
|00000020| 40 65 62 6f 6e 79 2e 63 | 72 61 79 2e 63 6f 6d 20 |@ebony.c|ray.com |
|00000030| 6f 6e 20 4d 6f 6e 20 4d | 61 72 20 20 39 20 31 32 |on Mon M|ar 9 12|
|00000040| 3a 34 38 3a 34 32 20 31 | 39 39 38 0a 3b 3b 3b 20 |:48:42 1|998.;;; |
|00000050| 66 72 6f 6d 20 66 69 6c | 65 20 2f 68 6f 6d 65 2f |from fil|e /home/|
|00000060| 61 73 70 65 6e 30 37 2f | 6a 75 73 74 69 6e 62 2f |aspen07/|justinb/|
|00000070| 72 6f 6f 74 73 2f 66 72 | 65 65 77 61 72 65 2f 78 |roots/fr|eeware/x|
|00000080| 65 6d 61 63 73 2f 32 30 | 2e 33 2f 78 65 6d 61 63 |emacs/20|.3/xemac|
|00000090| 73 2d 32 30 2e 33 2f 6c | 69 73 70 2f 65 64 69 66 |s-20.3/l|isp/edif|
|000000a0| 66 2f 65 64 69 66 66 2e | 65 6c 0a 3b 3b 3b 20 65 |f/ediff.|el.;;; e|
|000000b0| 6d 61 63 73 20 76 65 72 | 73 69 6f 6e 20 32 30 2e |macs ver|sion 20.|
|000000c0| 34 20 22 45 6d 65 72 61 | 6c 64 22 20 58 45 6d 61 |4 "Emera|ld" XEma|
|000000d0| 63 73 20 20 4c 75 63 69 | 64 2e 0a 3b 3b 3b 20 62 |cs Luci|d..;;; b|
|000000e0| 79 74 65 63 6f 6d 70 20 | 76 65 72 73 69 6f 6e 20 |ytecomp |version |
|000000f0| 32 2e 32 35 20 58 45 6d | 61 63 73 3b 20 32 32 2d |2.25 XEm|acs; 22-|
|00000100| 4d 61 72 2d 39 36 2e 0a | 3b 3b 3b 20 6f 70 74 69 |Mar-96..|;;; opti|
|00000110| 6d 69 7a 61 74 69 6f 6e | 20 69 73 20 6f 6e 2e 0a |mization| is on..|
|00000120| 3b 3b 3b 20 74 68 69 73 | 20 66 69 6c 65 20 75 73 |;;; this| file us|
|00000130| 65 73 20 6f 70 63 6f 64 | 65 73 20 77 68 69 63 68 |es opcod|es which|
|00000140| 20 64 6f 20 6e 6f 74 20 | 65 78 69 73 74 20 69 6e | do not |exist in|
|00000150| 20 45 6d 61 63 73 20 31 | 39 2e 0a 0a 28 69 66 20 | Emacs 1|9...(if |
|00000160| 28 61 6e 64 20 28 62 6f | 75 6e 64 70 20 27 65 6d |(and (bo|undp 'em|
|00000170| 61 63 73 2d 76 65 72 73 | 69 6f 6e 29 0a 09 20 28 |acs-vers|ion).. (|
|00000180| 6f 72 20 28 61 6e 64 20 | 28 62 6f 75 6e 64 70 20 |or (and |(boundp |
|00000190| 27 65 70 6f 63 68 3a 3a | 76 65 72 73 69 6f 6e 29 |'epoch::|version)|
|000001a0| 20 65 70 6f 63 68 3a 3a | 76 65 72 73 69 6f 6e 29 | epoch::|version)|
|000001b0| 0a 09 20 20 20 20 20 28 | 73 74 72 69 6e 67 2d 6c |.. (|string-l|
|000001c0| 65 73 73 70 20 65 6d 61 | 63 73 2d 76 65 72 73 69 |essp ema|cs-versi|
|000001d0| 6f 6e 20 22 32 30 22 29 | 29 29 0a 20 20 20 20 28 |on "20")|)). (|
|000001e0| 65 72 72 6f 72 20 22 60 | 65 64 69 66 66 2e 65 6c |error "`|ediff.el|
|000001f0| 27 20 77 61 73 20 63 6f | 6d 70 69 6c 65 64 20 66 |' was co|mpiled f|
|00000200| 6f 72 20 45 6d 61 63 73 | 20 32 30 22 29 29 0a 0a |or Emacs| 20"))..|
|00000210| 28 6f 72 20 28 62 6f 75 | 6e 64 70 20 27 63 75 72 |(or (bou|ndp 'cur|
|00000220| 72 65 6e 74 2d 6c 6f 61 | 64 2d 6c 69 73 74 29 20 |rent-loa|d-list) |
|00000230| 28 73 65 74 71 20 63 75 | 72 72 65 6e 74 2d 6c 6f |(setq cu|rrent-lo|
|00000240| 61 64 2d 6c 69 73 74 20 | 6e 69 6c 29 29 0a 0a 0a |ad-list |nil))...|
|00000250| 23 40 33 30 20 54 68 65 | 20 63 75 72 72 65 6e 74 |#@30 The| current|
|00000260| 20 76 65 72 73 69 6f 6e | 20 6f 66 20 45 64 69 66 | version| of Edif|
|00000270| 66 1f 0a 28 64 65 66 63 | 6f 6e 73 74 20 65 64 69 |f..(defc|onst edi|
|00000280| 66 66 2d 76 65 72 73 69 | 6f 6e 20 22 32 2e 36 39 |ff-versi|on "2.69|
|00000290| 22 20 28 23 24 20 2e 20 | 35 39 37 29 29 0a 23 40 |" (#$ . |597)).#@|
|000002a0| 32 31 20 44 61 74 65 20 | 6f 66 20 6c 61 73 74 20 |21 Date |of last |
|000002b0| 75 70 64 61 74 65 1f 0a | 28 64 65 66 63 6f 6e 73 |update..|(defcons|
|000002c0| 74 20 65 64 69 66 66 2d | 64 61 74 65 20 22 4f 63 |t ediff-|date "Oc|
|000002d0| 74 6f 62 65 72 20 31 30 | 2c 20 31 39 39 37 22 20 |tober 10|, 1997" |
|000002e0| 28 23 24 20 2e 20 36 37 | 35 29 29 0a 28 62 79 74 |(#$ . 67|5)).(byt|
|000002f0| 65 2d 63 6f 64 65 20 22 | c0 c1 21 88 c2 0b 42 13 |e-code "|..!...B.|
|00000300| c4 0b 42 13 c5 0b 42 13 | c6 c7 21 88 c6 c8 21 88 |..B...B.|..!...!.|
|00000310| c9 c1 ca cb cc cd ce cf | 26 07 87 22 20 5b 70 72 |........|&.." [pr|
|00000320| 6f 76 69 64 65 20 65 64 | 69 66 66 20 63 76 73 2d |ovide ed|iff cvs-|
|00000330| 63 6f 6f 6b 69 65 2d 68 | 61 6e 64 6c 65 20 63 75 |cookie-h|andle cu|
|00000340| 72 72 65 6e 74 2d 6c 6f | 61 64 2d 6c 69 73 74 20 |rrent-lo|ad-list |
|00000350| 65 64 69 66 66 2d 6c 61 | 73 74 2d 64 69 72 2d 70 |ediff-la|st-dir-p|
|00000360| 61 74 63 68 20 65 64 69 | 66 66 2d 70 61 74 63 68 |atch edi|ff-patch|
|00000370| 2d 64 65 66 61 75 6c 74 | 2d 64 69 72 65 63 74 6f |-default|-directo|
|00000380| 72 79 20 72 65 71 75 69 | 72 65 20 65 64 69 66 66 |ry requi|re ediff|
|00000390| 2d 69 6e 69 74 20 65 64 | 69 66 66 2d 6d 75 6c 74 |-init ed|iff-mult|
|000003a0| 20 63 75 73 74 6f 6d 2d | 64 65 63 6c 61 72 65 2d | custom-|declare-|
|000003b0| 67 72 6f 75 70 20 6e 69 | 6c 20 22 41 20 63 6f 6d |group ni|l "A com|
|000003c0| 70 72 65 68 65 6e 73 69 | 76 65 20 76 69 73 75 61 |prehensi|ve visua|
|000003d0| 6c 20 69 6e 74 65 72 66 | 61 63 65 20 74 6f 20 64 |l interf|ace to d|
|000003e0| 69 66 66 20 26 20 70 61 | 74 63 68 22 20 3a 74 61 |iff & pa|tch" :ta|
|000003f0| 67 20 22 45 64 69 66 66 | 22 20 3a 67 72 6f 75 70 |g "Ediff|" :group|
|00000400| 20 74 6f 6f 6c 73 5d 20 | 38 29 0a 28 63 75 73 74 | tools] |8).(cust|
|00000410| 6f 6d 2d 64 65 63 6c 61 | 72 65 2d 76 61 72 69 61 |om-decla|re-varia|
|00000420| 62 6c 65 20 27 65 64 69 | 66 66 2d 75 73 65 2d 6c |ble 'edi|ff-use-l|
|00000430| 61 73 74 2d 64 69 72 20 | 27 6e 69 6c 20 22 2a 49 |ast-dir |'nil "*I|
|00000440| 66 20 74 2c 20 45 64 69 | 66 66 20 77 69 6c 6c 20 |f t, Edi|ff will |
|00000450| 75 73 65 20 70 72 65 76 | 69 6f 75 73 20 64 69 72 |use prev|ious dir|
|00000460| 65 63 74 6f 72 79 20 61 | 73 20 64 65 66 61 75 6c |ectory a|s defaul|
|00000470| 74 20 77 68 65 6e 20 72 | 65 61 64 69 6e 67 20 66 |t when r|eading f|
|00000480| 69 6c 65 20 6e 61 6d 65 | 2e 22 20 3a 74 79 70 65 |ile name|." :type|
|00000490| 20 27 62 6f 6f 6c 65 61 | 6e 20 3a 67 72 6f 75 70 | 'boolea|n :group|
|000004a0| 20 27 65 64 69 66 66 29 | 0a 28 62 79 74 65 2d 63 | 'ediff)|.(byte-c|
|000004b0| 6f 64 65 20 22 c0 c1 21 | ac 82 c2 11 c1 0b 42 13 |ode "..!|......B.|
|000004c0| c0 c4 21 ac 82 c2 14 c4 | 0b 42 13 c0 c5 21 ac 82 |..!.....|.B...!..|
|000004d0| c2 15 c5 0b 42 13 c0 c6 | 21 ac 83 c2 16 06 c6 0b |....B...|!.......|
|000004e0| 42 13 c7 0b 42 13 c2 87 | 22 20 5b 62 6f 75 6e 64 |B...B...|" [bound|
|000004f0| 70 20 65 64 69 66 66 2d | 6c 61 73 74 2d 64 69 72 |p ediff-|last-dir|
|00000500| 2d 41 20 6e 69 6c 20 63 | 75 72 72 65 6e 74 2d 6c |-A nil c|urrent-l|
|00000510| 6f 61 64 2d 6c 69 73 74 | 20 65 64 69 66 66 2d 6c |oad-list| ediff-l|
|00000520| 61 73 74 2d 64 69 72 2d | 42 20 65 64 69 66 66 2d |ast-dir-|B ediff-|
|00000530| 6c 61 73 74 2d 64 69 72 | 2d 43 20 65 64 69 66 66 |last-dir|-C ediff|
|00000540| 2d 6c 61 73 74 2d 64 69 | 72 2d 61 6e 63 65 73 74 |-last-di|r-ancest|
|00000550| 6f 72 20 65 64 69 66 66 | 2d 6c 61 73 74 2d 6d 65 |or ediff|-last-me|
|00000560| 72 67 65 2d 61 75 74 6f | 73 74 6f 72 65 2d 64 69 |rge-auto|store-di|
|00000570| 72 5d 20 32 29 0a 28 64 | 65 66 61 6c 69 61 73 20 |r] 2).(d|efalias |
|00000580| 27 65 64 69 66 66 2d 73 | 65 74 2d 72 65 61 64 2d |'ediff-s|et-read-|
|00000590| 6f 6e 6c 79 2d 69 6e 2d | 62 75 66 2d 41 20 23 5b |only-in-|buf-A #[|
|000005a0| 6e 69 6c 20 22 08 ab 95 | c1 08 21 ab 90 c2 c1 08 |nil "...|..!.....|
|000005b0| 21 21 ab 89 72 08 71 88 | c3 c4 21 29 87 0d c6 61 |!!..r.q.|..!)...a|
|000005c0| ae 84 c7 0e 08 21 87 22 | 20 5b 65 64 69 66 66 2d |.....!."| [ediff-|
|000005d0| 62 75 66 66 65 72 2d 41 | 20 67 65 74 2d 62 75 66 |buffer-A| get-buf|
|000005e0| 66 65 72 20 62 75 66 66 | 65 72 2d 6e 61 6d 65 20 |fer buff|er-name |
|000005f0| 74 6f 67 67 6c 65 2d 72 | 65 61 64 2d 6f 6e 6c 79 |toggle-r|ead-only|
|00000600| 20 31 20 74 68 69 73 2d | 63 6f 6d 6d 61 6e 64 20 | 1 this-|command |
|00000610| 65 64 69 66 66 2d 71 75 | 69 74 20 65 72 72 6f 72 |ediff-qu|it error|
|00000620| 20 65 64 69 66 66 2d 4b | 49 4c 4c 45 44 2d 56 49 | ediff-K|ILLED-VI|
|00000630| 54 41 4c 2d 42 55 46 46 | 45 52 5d 20 33 5d 29 0a |TAL-BUFF|ER] 3]).|
|00000640| 28 64 65 66 61 6c 69 61 | 73 20 27 65 64 69 66 66 |(defalia|s 'ediff|
|00000650| 2d 67 65 74 2d 64 65 66 | 61 75 6c 74 2d 66 69 6c |-get-def|ault-fil|
|00000660| 65 2d 6e 61 6d 65 20 23 | 5b 6e 69 6c 20 22 08 c1 |e-name #|[nil "..|
|00000670| 61 ab 92 c2 c3 c4 5c 22 | 89 1d 3b ad 87 c6 0d 21 |a.....\"|..;....!|
|00000680| 3f ad 81 0d 29 87 c7 70 | 21 ad 85 c8 c7 70 21 21 |?...)..p|!....p!!|
|00000690| 87 22 20 5b 6d 61 6a 6f | 72 2d 6d 6f 64 65 20 64 |." [majo|r-mode d|
|000006a0| 69 72 65 64 2d 6d 6f 64 | 65 20 64 69 72 65 64 2d |ired-mod|e dired-|
|000006b0| 67 65 74 2d 66 69 6c 65 | 6e 61 6d 65 20 6e 69 6c |get-file|name nil|
|000006c0| 20 6e 6f 2d 65 72 72 6f | 72 20 66 20 66 69 6c 65 | no-erro|r f file|
|000006d0| 2d 64 69 72 65 63 74 6f | 72 79 2d 70 20 62 75 66 |-directo|ry-p buf|
|000006e0| 66 65 72 2d 66 69 6c 65 | 2d 6e 61 6d 65 20 66 69 |fer-file|-name fi|
|000006f0| 6c 65 2d 6e 61 6d 65 2d | 6e 6f 6e 64 69 72 65 63 |le-name-|nondirec|
|00000700| 74 6f 72 79 5d 20 34 5d | 29 0a 23 40 35 30 20 52 |tory] 4]|).#@50 R|
|00000710| 75 6e 20 45 64 69 66 66 | 20 6f 6e 20 61 20 70 61 |un Ediff| on a pa|
|00000720| 69 72 20 6f 66 20 66 69 | 6c 65 73 2c 20 46 49 4c |ir of fi|les, FIL|
|00000730| 45 2d 41 20 61 6e 64 20 | 46 49 4c 45 2d 42 2e 1f |E-A and |FILE-B..|
|00000740| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|00000750| 66 2d 66 69 6c 65 73 20 | 23 5b 28 66 69 6c 65 2d |f-files |#[(file-|
|00000760| 41 20 66 69 6c 65 2d 42 | 20 26 6f 70 74 69 6f 6e |A file-B| &option|
|00000770| 61 6c 20 73 74 61 72 74 | 75 70 2d 68 6f 6f 6b 73 |al start|up-hooks|
|00000780| 29 20 22 c0 09 c2 0b 21 | ab 88 c4 c5 09 21 0b 5c |) "....!|.....!.\|
|00000790| 22 aa 81 0b c6 0e 07 c8 | 25 87 22 20 5b 65 64 69 |".......|%." [edi|
|000007a0| 66 66 2d 66 69 6c 65 73 | 2d 69 6e 74 65 72 6e 61 |ff-files|-interna|
|000007b0| 6c 20 66 69 6c 65 2d 41 | 20 66 69 6c 65 2d 64 69 |l file-A| file-di|
|000007c0| 72 65 63 74 6f 72 79 2d | 70 20 66 69 6c 65 2d 42 |rectory-|p file-B|
|000007d0| 20 65 78 70 61 6e 64 2d | 66 69 6c 65 2d 6e 61 6d | expand-|file-nam|
|000007e0| 65 20 66 69 6c 65 2d 6e | 61 6d 65 2d 6e 6f 6e 64 |e file-n|ame-nond|
|000007f0| 69 72 65 63 74 6f 72 79 | 20 6e 69 6c 20 73 74 61 |irectory| nil sta|
|00000800| 72 74 75 70 2d 68 6f 6f | 6b 73 20 65 64 69 66 66 |rtup-hoo|ks ediff|
|00000810| 2d 66 69 6c 65 73 5d 20 | 36 20 28 23 24 20 2e 20 |-files] |6 (#$ . |
|00000820| 31 38 30 37 29 20 28 6c | 65 74 20 28 28 64 69 72 |1807) (l|et ((dir|
|00000830| 2d 41 20 28 69 66 20 65 | 64 69 66 66 2d 75 73 65 |-A (if e|diff-use|
|00000840| 2d 6c 61 73 74 2d 64 69 | 72 20 65 64 69 66 66 2d |-last-di|r ediff-|
|00000850| 6c 61 73 74 2d 64 69 72 | 2d 41 20 64 65 66 61 75 |last-dir|-A defau|
|00000860| 6c 74 2d 64 69 72 65 63 | 74 6f 72 79 29 29 20 64 |lt-direc|tory)) d|
|00000870| 69 72 2d 42 20 66 29 20 | 28 6c 69 73 74 20 28 73 |ir-B f) |(list (s|
|00000880| 65 74 71 20 66 20 28 65 | 64 69 66 66 2d 72 65 61 |etq f (e|diff-rea|
|00000890| 64 2d 66 69 6c 65 2d 6e | 61 6d 65 20 22 46 69 6c |d-file-n|ame "Fil|
|000008a0| 65 20 41 20 74 6f 20 63 | 6f 6d 70 61 72 65 22 20 |e A to c|ompare" |
|000008b0| 64 69 72 2d 41 20 28 65 | 64 69 66 66 2d 67 65 74 |dir-A (e|diff-get|
|000008c0| 2d 64 65 66 61 75 6c 74 | 2d 66 69 6c 65 2d 6e 61 |-default|-file-na|
|000008d0| 6d 65 29 29 29 20 28 65 | 64 69 66 66 2d 72 65 61 |me))) (e|diff-rea|
|000008e0| 64 2d 66 69 6c 65 2d 6e | 61 6d 65 20 22 46 69 6c |d-file-n|ame "Fil|
|000008f0| 65 20 42 20 74 6f 20 63 | 6f 6d 70 61 72 65 22 20 |e B to c|ompare" |
|00000900| 28 73 65 74 71 20 64 69 | 72 2d 42 20 28 69 66 20 |(setq di|r-B (if |
|00000910| 65 64 69 66 66 2d 75 73 | 65 2d 6c 61 73 74 2d 64 |ediff-us|e-last-d|
|00000920| 69 72 20 65 64 69 66 66 | 2d 6c 61 73 74 2d 64 69 |ir ediff|-last-di|
|00000930| 72 2d 42 20 28 66 69 6c | 65 2d 6e 61 6d 65 2d 64 |r-B (fil|e-name-d|
|00000940| 69 72 65 63 74 6f 72 79 | 20 66 29 29 29 20 28 70 |irectory| f))) (p|
|00000950| 72 6f 67 6e 20 28 73 65 | 74 71 20 66 69 6c 65 2d |rogn (se|tq file-|
|00000960| 6e 61 6d 65 2d 68 69 73 | 74 6f 72 79 20 28 63 6f |name-his|tory (co|
|00000970| 6e 73 20 28 65 64 69 66 | 66 2d 61 62 62 72 65 76 |ns (edif|f-abbrev|
|00000980| 69 61 74 65 2d 66 69 6c | 65 2d 6e 61 6d 65 20 28 |iate-fil|e-name (|
|00000990| 65 78 70 61 6e 64 2d 66 | 69 6c 65 2d 6e 61 6d 65 |expand-f|ile-name|
|000009a0| 20 28 66 69 6c 65 2d 6e | 61 6d 65 2d 6e 6f 6e 64 | (file-n|ame-nond|
|000009b0| 69 72 65 63 74 6f 72 79 | 20 66 29 20 64 69 72 2d |irectory| f) dir-|
|000009c0| 42 29 29 20 66 69 6c 65 | 2d 6e 61 6d 65 2d 68 69 |B)) file|-name-hi|
|000009d0| 73 74 6f 72 79 29 29 20 | 66 29 29 29 29 5d 29 0a |story)) |f))))]).|
|000009e0| 23 40 35 35 20 52 75 6e | 20 45 64 69 66 66 20 6f |#@55 Run| Ediff o|
|000009f0| 6e 20 74 68 72 65 65 20 | 66 69 6c 65 73 2c 20 46 |n three |files, F|
|00000a00| 49 4c 45 2d 41 2c 20 46 | 49 4c 45 2d 42 2c 20 61 |ILE-A, F|ILE-B, a|
|00000a10| 6e 64 20 46 49 4c 45 2d | 43 2e 1f 0a 28 64 65 66 |nd FILE-|C...(def|
|00000a20| 61 6c 69 61 73 20 27 65 | 64 69 66 66 2d 66 69 6c |alias 'e|diff-fil|
|00000a30| 65 73 33 20 23 5b 28 66 | 69 6c 65 2d 41 20 66 69 |es3 #[(f|ile-A fi|
|00000a40| 6c 65 2d 42 20 66 69 6c | 65 2d 43 20 26 6f 70 74 |le-B fil|e-C &opt|
|00000a50| 69 6f 6e 61 6c 20 73 74 | 61 72 74 75 70 2d 68 6f |ional st|artup-ho|
|00000a60| 6f 6b 73 29 20 22 c0 09 | c2 0b 21 ab 88 c4 c5 09 |oks) "..|..!.....|
|00000a70| 21 0b 5c 22 aa 81 0b c2 | 0e 06 21 ab 89 c4 c5 09 |!.\"....|..!.....|
|00000a80| 21 0e 06 5c 22 aa 82 0e | 06 0e 07 c8 25 87 22 20 |!..\"...|....%." |
|00000a90| 5b 65 64 69 66 66 2d 66 | 69 6c 65 73 2d 69 6e 74 |[ediff-f|iles-int|
|00000aa0| 65 72 6e 61 6c 20 66 69 | 6c 65 2d 41 20 66 69 6c |ernal fi|le-A fil|
|00000ab0| 65 2d 64 69 72 65 63 74 | 6f 72 79 2d 70 20 66 69 |e-direct|ory-p fi|
|00000ac0| 6c 65 2d 42 20 65 78 70 | 61 6e 64 2d 66 69 6c 65 |le-B exp|and-file|
|00000ad0| 2d 6e 61 6d 65 20 66 69 | 6c 65 2d 6e 61 6d 65 2d |-name fi|le-name-|
|00000ae0| 6e 6f 6e 64 69 72 65 63 | 74 6f 72 79 20 66 69 6c |nondirec|tory fil|
|00000af0| 65 2d 43 20 73 74 61 72 | 74 75 70 2d 68 6f 6f 6b |e-C star|tup-hook|
|00000b00| 73 20 65 64 69 66 66 2d | 66 69 6c 65 73 33 5d 20 |s ediff-|files3] |
|00000b10| 36 20 28 23 24 20 2e 20 | 32 35 33 33 29 20 28 6c |6 (#$ . |2533) (l|
|00000b20| 65 74 20 28 28 64 69 72 | 2d 41 20 28 69 66 20 65 |et ((dir|-A (if e|
|00000b30| 64 69 66 66 2d 75 73 65 | 2d 6c 61 73 74 2d 64 69 |diff-use|-last-di|
|00000b40| 72 20 65 64 69 66 66 2d | 6c 61 73 74 2d 64 69 72 |r ediff-|last-dir|
|00000b50| 2d 41 20 64 65 66 61 75 | 6c 74 2d 64 69 72 65 63 |-A defau|lt-direc|
|00000b60| 74 6f 72 79 29 29 20 64 | 69 72 2d 42 20 64 69 72 |tory)) d|ir-B dir|
|00000b70| 2d 43 20 66 20 66 66 29 | 20 28 6c 69 73 74 20 28 |-C f ff)| (list (|
|00000b80| 73 65 74 71 20 66 20 28 | 65 64 69 66 66 2d 72 65 |setq f (|ediff-re|
|00000b90| 61 64 2d 66 69 6c 65 2d | 6e 61 6d 65 20 22 46 69 |ad-file-|name "Fi|
|00000ba0| 6c 65 20 41 20 74 6f 20 | 63 6f 6d 70 61 72 65 22 |le A to |compare"|
|00000bb0| 20 64 69 72 2d 41 20 28 | 65 64 69 66 66 2d 67 65 | dir-A (|ediff-ge|
|00000bc0| 74 2d 64 65 66 61 75 6c | 74 2d 66 69 6c 65 2d 6e |t-defaul|t-file-n|
|00000bd0| 61 6d 65 29 29 29 20 28 | 73 65 74 71 20 66 66 20 |ame))) (|setq ff |
|00000be0| 28 65 64 69 66 66 2d 72 | 65 61 64 2d 66 69 6c 65 |(ediff-r|ead-file|
|00000bf0| 2d 6e 61 6d 65 20 22 46 | 69 6c 65 20 42 20 74 6f |-name "F|ile B to|
|00000c00| 20 63 6f 6d 70 61 72 65 | 22 20 28 73 65 74 71 20 | compare|" (setq |
|00000c10| 64 69 72 2d 42 20 28 69 | 66 20 65 64 69 66 66 2d |dir-B (i|f ediff-|
|00000c20| 75 73 65 2d 6c 61 73 74 | 2d 64 69 72 20 65 64 69 |use-last|-dir edi|
|00000c30| 66 66 2d 6c 61 73 74 2d | 64 69 72 2d 42 20 28 66 |ff-last-|dir-B (f|
|00000c40| 69 6c 65 2d 6e 61 6d 65 | 2d 64 69 72 65 63 74 6f |ile-name|-directo|
|00000c50| 72 79 20 66 29 29 29 20 | 28 70 72 6f 67 6e 20 28 |ry f))) |(progn (|
|00000c60| 73 65 74 71 20 66 69 6c | 65 2d 6e 61 6d 65 2d 68 |setq fil|e-name-h|
|00000c70| 69 73 74 6f 72 79 20 28 | 63 6f 6e 73 20 28 65 64 |istory (|cons (ed|
|00000c80| 69 66 66 2d 61 62 62 72 | 65 76 69 61 74 65 2d 66 |iff-abbr|eviate-f|
|00000c90| 69 6c 65 2d 6e 61 6d 65 | 20 28 65 78 70 61 6e 64 |ile-name| (expand|
|00000ca0| 2d 66 69 6c 65 2d 6e 61 | 6d 65 20 28 66 69 6c 65 |-file-na|me (file|
|00000cb0| 2d 6e 61 6d 65 2d 6e 6f | 6e 64 69 72 65 63 74 6f |-name-no|ndirecto|
|00000cc0| 72 79 20 66 29 20 64 69 | 72 2d 42 29 29 20 66 69 |ry f) di|r-B)) fi|
|00000cd0| 6c 65 2d 6e 61 6d 65 2d | 68 69 73 74 6f 72 79 29 |le-name-|history)|
|00000ce0| 29 20 66 29 29 29 20 28 | 65 64 69 66 66 2d 72 65 |) f))) (|ediff-re|
|00000cf0| 61 64 2d 66 69 6c 65 2d | 6e 61 6d 65 20 22 46 69 |ad-file-|name "Fi|
|00000d00| 6c 65 20 43 20 74 6f 20 | 63 6f 6d 70 61 72 65 22 |le C to |compare"|
|00000d10| 20 28 73 65 74 71 20 64 | 69 72 2d 43 20 28 69 66 | (setq d|ir-C (if|
|00000d20| 20 65 64 69 66 66 2d 75 | 73 65 2d 6c 61 73 74 2d | ediff-u|se-last-|
|00000d30| 64 69 72 20 65 64 69 66 | 66 2d 6c 61 73 74 2d 64 |dir edif|f-last-d|
|00000d40| 69 72 2d 43 20 28 66 69 | 6c 65 2d 6e 61 6d 65 2d |ir-C (fi|le-name-|
|00000d50| 64 69 72 65 63 74 6f 72 | 79 20 66 66 29 29 29 20 |director|y ff))) |
|00000d60| 28 70 72 6f 67 6e 20 28 | 73 65 74 71 20 66 69 6c |(progn (|setq fil|
|00000d70| 65 2d 6e 61 6d 65 2d 68 | 69 73 74 6f 72 79 20 28 |e-name-h|istory (|
|00000d80| 63 6f 6e 73 20 28 65 64 | 69 66 66 2d 61 62 62 72 |cons (ed|iff-abbr|
|00000d90| 65 76 69 61 74 65 2d 66 | 69 6c 65 2d 6e 61 6d 65 |eviate-f|ile-name|
|00000da0| 20 28 65 78 70 61 6e 64 | 2d 66 69 6c 65 2d 6e 61 | (expand|-file-na|
|00000db0| 6d 65 20 28 66 69 6c 65 | 2d 6e 61 6d 65 2d 6e 6f |me (file|-name-no|
|00000dc0| 6e 64 69 72 65 63 74 6f | 72 79 20 66 66 29 20 64 |ndirecto|ry ff) d|
|00000dd0| 69 72 2d 43 29 29 20 66 | 69 6c 65 2d 6e 61 6d 65 |ir-C)) f|ile-name|
|00000de0| 2d 68 69 73 74 6f 72 79 | 29 29 20 66 66 29 29 29 |-history|)) ff)))|
|00000df0| 29 5d 29 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 |)]).(def|alias 'e|
|00000e00| 64 69 66 66 33 20 27 65 | 64 69 66 66 2d 66 69 6c |diff3 'e|diff-fil|
|00000e10| 65 73 33 29 0a 28 64 65 | 66 61 6c 69 61 73 20 27 |es3).(de|falias '|
|00000e20| 65 64 69 66 66 2d 66 69 | 6e 64 2d 66 69 6c 65 20 |ediff-fi|nd-file |
|00000e30| 23 5b 28 66 69 6c 65 2d | 76 61 72 20 62 75 66 66 |#[(file-|var buff|
|00000e40| 65 72 2d 6e 61 6d 65 20 | 26 6f 70 74 69 6f 6e 61 |er-name |&optiona|
|00000e50| 6c 20 6c 61 73 74 2d 64 | 69 72 20 68 6f 6f 6b 73 |l last-d|ir hooks|
|00000e60| 2d 76 61 72 29 20 22 08 | 4a 19 c2 09 21 1b c4 09 |-var) ".|J...!...|
|00000e70| 21 1d c6 09 21 ac 87 c7 | c8 09 5c 22 88 aa 8a c9 |!...!...|..\"....|
|00000e80| 09 21 ab 85 c7 ca 09 5c | 22 88 cb 09 21 11 0e 0c |.!.....\|"...!...|
|00000e90| ab 89 0e 0c cb cd 09 21 | 21 4c 88 0e 0e cf 09 21 |.......!|!L.....!|
|00000ea0| 4c 88 0e 0e 4a ab d9 d0 | 0e 0e 4a 21 ab d2 ce d0 |L...J...|..J!....|
|00000eb0| 0e 0e 4a 21 21 ab c9 72 | 0e 0e 4a 71 88 7e 88 0b |..J!!..r|..Jq.~..|
|00000ec0| ab 99 d1 d2 21 88 d3 70 | 0d 5c 22 11 0e 14 d5 d6 |....!..p|.\".....|
|00000ed0| d7 09 44 45 0e 14 4a 42 | 4c 88 aa a2 d8 09 21 d8 |..DE..JB|L.....!.|
|00000ee0| d9 20 21 6b ac 95 d3 70 | 0d 5c 22 11 0e 14 d5 d6 |. !k...p|.\".....|
|00000ef0| d7 09 44 45 0e 14 4a 42 | 4c 88 aa 83 d1 20 88 29 |..DE..JB|L.... .)|
|00000f00| aa 8b 0e 1a db 61 ac 85 | c7 0e 1c 21 88 08 09 4c |.....a..|...!...L|
|00000f10| 2b 87 22 20 5b 66 69 6c | 65 2d 76 61 72 20 66 69 |+." [fil|e-var fi|
|00000f20| 6c 65 20 65 64 69 66 66 | 2d 66 69 6c 65 6e 61 6d |le ediff|-filenam|
|00000f30| 65 2d 6d 61 67 69 63 2d | 70 20 66 69 6c 65 2d 6d |e-magic-|p file-m|
|00000f40| 61 67 69 63 20 66 69 6c | 65 2d 6e 61 6d 65 2d 6e |agic fil|e-name-n|
|00000f50| 6f 6e 64 69 72 65 63 74 | 6f 72 79 20 74 65 6d 70 |ondirect|ory temp|
|00000f60| 2d 66 69 6c 65 2d 6e 61 | 6d 65 2d 70 72 65 66 69 |-file-na|me-prefi|
|00000f70| 78 20 66 69 6c 65 2d 72 | 65 61 64 61 62 6c 65 2d |x file-r|eadable-|
|00000f80| 70 20 65 72 72 6f 72 20 | 22 46 69 6c 65 20 60 25 |p error |"File `%|
|00000f90| 73 27 20 64 6f 65 73 20 | 6e 6f 74 20 65 78 69 73 |s' does |not exis|
|00000fa0| 74 20 6f 72 20 69 73 20 | 6e 6f 74 20 72 65 61 64 |t or is |not read|
|00000fb0| 61 62 6c 65 22 20 66 69 | 6c 65 2d 64 69 72 65 63 |able" fi|le-direc|
|00000fc0| 74 6f 72 79 2d 70 20 22 | 46 69 6c 65 20 60 25 73 |tory-p "|File `%s|
|00000fd0| 27 20 69 73 20 61 20 64 | 69 72 65 63 74 6f 72 79 |' is a d|irectory|
|00000fe0| 22 20 65 78 70 61 6e 64 | 2d 66 69 6c 65 2d 6e 61 |" expand|-file-na|
|00000ff0| 6d 65 20 6c 61 73 74 2d | 64 69 72 20 66 69 6c 65 |me last-|dir file|
|00001000| 2d 6e 61 6d 65 2d 64 69 | 72 65 63 74 6f 72 79 20 |-name-di|rectory |
|00001010| 62 75 66 66 65 72 2d 6e | 61 6d 65 20 66 69 6e 64 |buffer-n|ame find|
|00001020| 2d 66 69 6c 65 2d 6e 6f | 73 65 6c 65 63 74 20 67 |-file-no|select g|
|00001030| 65 74 2d 62 75 66 66 65 | 72 20 65 64 69 66 66 2d |et-buffe|r ediff-|
|00001040| 76 65 72 69 66 79 2d 66 | 69 6c 65 2d 62 75 66 66 |verify-f|ile-buff|
|00001050| 65 72 20 6d 61 67 69 63 | 20 65 64 69 66 66 2d 6d |er magic| ediff-m|
|00001060| 61 6b 65 2d 74 65 6d 70 | 2d 66 69 6c 65 20 68 6f |ake-temp|-file ho|
|00001070| 6f 6b 73 2d 76 61 72 20 | 6c 61 6d 62 64 61 20 6e |oks-var |lambda n|
|00001080| 69 6c 20 64 65 6c 65 74 | 65 2d 66 69 6c 65 20 66 |il delet|e-file f|
|00001090| 69 6c 65 2d 74 72 75 65 | 6e 61 6d 65 20 62 75 66 |ile-true|name buf|
|000010a0| 66 65 72 2d 66 69 6c 65 | 2d 6e 61 6d 65 20 74 68 |fer-file|-name th|
|000010b0| 69 73 2d 63 6f 6d 6d 61 | 6e 64 20 65 64 69 66 66 |is-comma|nd ediff|
|000010c0| 2d 71 75 69 74 20 65 64 | 69 66 66 2d 4b 49 4c 4c |-quit ed|iff-KILL|
|000010d0| 45 44 2d 56 49 54 41 4c | 2d 42 55 46 46 45 52 5d |ED-VITAL|-BUFFER]|
|000010e0| 20 35 5d 29 0a 28 64 65 | 66 61 6c 69 61 73 20 27 | 5]).(de|falias '|
|000010f0| 65 64 69 66 66 2d 66 69 | 6c 65 73 2d 69 6e 74 65 |ediff-fi|les-inte|
|00001100| 72 6e 61 6c 20 23 5b 28 | 66 69 6c 65 2d 41 20 66 |rnal #[(|file-A f|
|00001110| 69 6c 65 2d 42 20 66 69 | 6c 65 2d 43 20 73 74 61 |ile-B fi|le-C sta|
|00001120| 72 74 75 70 2d 68 6f 6f | 6b 73 20 6a 6f 62 2d 6e |rtup-hoo|ks job-n|
|00001130| 61 6d 65 20 26 6f 70 74 | 69 6f 6e 61 6c 20 6d 65 |ame &opt|ional me|
|00001140| 72 67 65 2d 62 75 66 66 | 65 72 2d 66 69 6c 65 29 |rge-buff|er-file)|
|00001150| 20 22 c0 89 89 19 1a 1b | c4 c5 0e 06 5c 22 88 c7 | "......|....\"..|
|00001160| c6 c3 c8 c9 24 88 c4 c5 | 0e 5c 6e 5c 22 88 c7 ca |....$...|.\n\"...|
|00001170| c2 cb c9 24 88 0e 0c 3b | ab 96 c4 c5 0e 0c 5c 22 |...$...;|......\"|
|00001180| 88 c7 cc c1 0e 0d ce 61 | ab 83 cf aa 81 d0 c9 24 |.......a|.......$|
|00001190| 88 d1 0b 0e 06 5c 6e 0e | 5c 6e 09 0e 0c 0e 09 d2 |.....\n.|\n......|
|000011a0| 0e 0d 42 43 0e 13 26 09 | 2b 87 22 20 5b 6e 69 6c |..BC..&.|+." [nil|
|000011b0| 20 62 75 66 2d 43 20 62 | 75 66 2d 42 20 62 75 66 | buf-C b|uf-B buf|
|000011c0| 2d 41 20 6d 65 73 73 61 | 67 65 20 22 52 65 61 64 |-A messa|ge "Read|
|000011d0| 69 6e 67 20 66 69 6c 65 | 20 25 73 20 2e 2e 2e 20 |ing file| %s ... |
|000011e0| 22 20 66 69 6c 65 2d 41 | 20 65 64 69 66 66 2d 66 |" file-A| ediff-f|
|000011f0| 69 6e 64 2d 66 69 6c 65 | 20 65 64 69 66 66 2d 6c |ind-file| ediff-l|
|00001200| 61 73 74 2d 64 69 72 2d | 41 20 73 74 61 72 74 75 |ast-dir-|A startu|
|00001210| 70 2d 68 6f 6f 6b 73 20 | 66 69 6c 65 2d 42 20 65 |p-hooks |file-B e|
|00001220| 64 69 66 66 2d 6c 61 73 | 74 2d 64 69 72 2d 42 20 |diff-las|t-dir-B |
|00001230| 66 69 6c 65 2d 43 20 6a | 6f 62 2d 6e 61 6d 65 20 |file-C j|ob-name |
|00001240| 65 64 69 66 66 2d 6d 65 | 72 67 65 2d 66 69 6c 65 |ediff-me|rge-file|
|00001250| 73 2d 77 69 74 68 2d 61 | 6e 63 65 73 74 6f 72 20 |s-with-a|ncestor |
|00001260| 65 64 69 66 66 2d 6c 61 | 73 74 2d 64 69 72 2d 61 |ediff-la|st-dir-a|
|00001270| 6e 63 65 73 74 6f 72 20 | 65 64 69 66 66 2d 6c 61 |ncestor |ediff-la|
|00001280| 73 74 2d 64 69 72 2d 43 | 20 65 64 69 66 66 2d 73 |st-dir-C| ediff-s|
|00001290| 65 74 75 70 20 65 64 69 | 66 66 2d 6a 6f 62 2d 6e |etup edi|ff-job-n|
|000012a0| 61 6d 65 20 6d 65 72 67 | 65 2d 62 75 66 66 65 72 |ame merg|e-buffer|
|000012b0| 2d 66 69 6c 65 5d 20 31 | 30 5d 29 0a 28 64 65 66 |-file] 1|0]).(def|
|000012c0| 61 6c 69 61 73 20 27 65 | 64 69 66 66 20 27 65 64 |alias 'e|diff 'ed|
|000012d0| 69 66 66 2d 66 69 6c 65 | 73 29 0a 23 40 35 36 20 |iff-file|s).#@56 |
|000012e0| 52 75 6e 20 45 64 69 66 | 66 20 6f 6e 20 61 20 70 |Run Edif|f on a p|
|000012f0| 61 69 72 20 6f 66 20 62 | 75 66 66 65 72 73 2c 20 |air of b|uffers, |
|00001300| 42 55 46 46 45 52 2d 41 | 20 61 6e 64 20 42 55 46 |BUFFER-A| and BUF|
|00001310| 46 45 52 2d 42 2e 1f 0a | 28 64 65 66 61 6c 69 61 |FER-B...|(defalia|
|00001320| 73 20 27 65 64 69 66 66 | 2d 62 75 66 66 65 72 73 |s 'ediff|-buffers|
|00001330| 20 23 5b 28 62 75 66 66 | 65 72 2d 41 20 62 75 66 | #[(buff|er-A buf|
|00001340| 66 65 72 2d 42 20 26 6f | 70 74 69 6f 6e 61 6c 20 |fer-B &o|ptional |
|00001350| 73 74 61 72 74 75 70 2d | 68 6f 6f 6b 73 20 6a 6f |startup-|hooks jo|
|00001360| 62 2d 6e 61 6d 65 29 20 | 22 08 ac 82 c1 10 c2 0b |b-name) |".......|
|00001370| 0c c5 0e 06 08 25 87 22 | 20 5b 6a 6f 62 2d 6e 61 |.....%."| [job-na|
|00001380| 6d 65 20 65 64 69 66 66 | 2d 62 75 66 66 65 72 73 |me ediff|-buffers|
|00001390| 20 65 64 69 66 66 2d 62 | 75 66 66 65 72 73 2d 69 | ediff-b|uffers-i|
|000013a0| 6e 74 65 72 6e 61 6c 20 | 62 75 66 66 65 72 2d 41 |nternal |buffer-A|
|000013b0| 20 62 75 66 66 65 72 2d | 42 20 6e 69 6c 20 73 74 | buffer-|B nil st|
|000013c0| 61 72 74 75 70 2d 68 6f | 6f 6b 73 5d 20 36 20 28 |artup-ho|oks] 6 (|
|000013d0| 23 24 20 2e 20 34 38 33 | 32 29 20 28 6c 65 74 20 |#$ . 483|2) (let |
|000013e0| 28 62 66 29 20 28 6c 69 | 73 74 20 28 73 65 74 71 |(bf) (li|st (setq|
|000013f0| 20 62 66 20 28 72 65 61 | 64 2d 62 75 66 66 65 72 | bf (rea|d-buffer|
|00001400| 20 22 42 75 66 66 65 72 | 20 41 20 74 6f 20 63 6f | "Buffer| A to co|
|00001410| 6d 70 61 72 65 3a 20 22 | 20 28 65 64 69 66 66 2d |mpare: "| (ediff-|
|00001420| 6f 74 68 65 72 2d 62 75 | 66 66 65 72 20 22 22 29 |other-bu|ffer "")|
|00001430| 20 74 29 29 20 28 72 65 | 61 64 2d 62 75 66 66 65 | t)) (re|ad-buffe|
|00001440| 72 20 22 42 75 66 66 65 | 72 20 42 20 74 6f 20 63 |r "Buffe|r B to c|
|00001450| 6f 6d 70 61 72 65 3a 20 | 22 20 28 70 72 6f 67 6e |ompare: |" (progn|
|00001460| 20 28 73 61 76 65 2d 77 | 69 6e 64 6f 77 2d 65 78 | (save-w|indow-ex|
|00001470| 63 75 72 73 69 6f 6e 20 | 28 6f 74 68 65 72 2d 77 |cursion |(other-w|
|00001480| 69 6e 64 6f 77 20 31 29 | 29 20 28 65 64 69 66 66 |indow 1)|) (ediff|
|00001490| 2d 6f 74 68 65 72 2d 62 | 75 66 66 65 72 20 62 66 |-other-b|uffer bf|
|000014a0| 29 29 20 74 29 29 29 5d | 29 0a 28 64 65 66 61 6c |)) t)))]|).(defal|
|000014b0| 69 61 73 20 27 65 62 75 | 66 66 65 72 73 20 27 65 |ias 'ebu|ffers 'e|
|000014c0| 64 69 66 66 2d 62 75 66 | 66 65 72 73 29 0a 23 40 |diff-buf|fers).#@|
|000014d0| 36 33 20 52 75 6e 20 45 | 64 69 66 66 20 6f 6e 20 |63 Run E|diff on |
|000014e0| 74 68 72 65 65 20 62 75 | 66 66 65 72 73 2c 20 42 |three bu|ffers, B|
|000014f0| 55 46 46 45 52 2d 41 2c | 20 42 55 46 46 45 52 2d |UFFER-A,| BUFFER-|
|00001500| 42 2c 20 61 6e 64 20 42 | 55 46 46 45 52 2d 43 2e |B, and B|UFFER-C.|
|00001510| 1f 0a 28 64 65 66 61 6c | 69 61 73 20 27 65 64 69 |..(defal|ias 'edi|
|00001520| 66 66 2d 62 75 66 66 65 | 72 73 33 20 23 5b 28 62 |ff-buffe|rs3 #[(b|
|00001530| 75 66 66 65 72 2d 41 20 | 62 75 66 66 65 72 2d 42 |uffer-A |buffer-B|
|00001540| 20 62 75 66 66 65 72 2d | 43 20 26 6f 70 74 69 6f | buffer-|C &optio|
|00001550| 6e 61 6c 20 73 74 61 72 | 74 75 70 2d 68 6f 6f 6b |nal star|tup-hook|
|00001560| 73 20 6a 6f 62 2d 6e 61 | 6d 65 29 20 22 08 ac 82 |s job-na|me) "...|
|00001570| c1 10 c2 0b 0c 0d 0e 06 | 08 25 87 22 20 5b 6a 6f |........|.%." [jo|
|00001580| 62 2d 6e 61 6d 65 20 65 | 64 69 66 66 2d 62 75 66 |b-name e|diff-buf|
|00001590| 66 65 72 73 33 20 65 64 | 69 66 66 2d 62 75 66 66 |fers3 ed|iff-buff|
|000015a0| 65 72 73 2d 69 6e 74 65 | 72 6e 61 6c 20 62 75 66 |ers-inte|rnal buf|
|000015b0| 66 65 72 2d 41 20 62 75 | 66 66 65 72 2d 42 20 62 |fer-A bu|ffer-B b|
|000015c0| 75 66 66 65 72 2d 43 20 | 73 74 61 72 74 75 70 2d |uffer-C |startup-|
|000015d0| 68 6f 6f 6b 73 5d 20 36 | 20 28 23 24 20 2e 20 35 |hooks] 6| (#$ . 5|
|000015e0| 33 33 31 29 20 28 6c 65 | 74 20 28 62 66 20 62 66 |331) (le|t (bf bf|
|000015f0| 66 29 20 28 6c 69 73 74 | 20 28 73 65 74 71 20 62 |f) (list| (setq b|
|00001600| 66 20 28 72 65 61 64 2d | 62 75 66 66 65 72 20 22 |f (read-|buffer "|
|00001610| 42 75 66 66 65 72 20 41 | 20 74 6f 20 63 6f 6d 70 |Buffer A| to comp|
|00001620| 61 72 65 3a 20 22 20 28 | 65 64 69 66 66 2d 6f 74 |are: " (|ediff-ot|
|00001630| 68 65 72 2d 62 75 66 66 | 65 72 20 22 22 29 20 74 |her-buff|er "") t|
|00001640| 29 29 20 28 73 65 74 71 | 20 62 66 66 20 28 72 65 |)) (setq| bff (re|
|00001650| 61 64 2d 62 75 66 66 65 | 72 20 22 42 75 66 66 65 |ad-buffe|r "Buffe|
|00001660| 72 20 42 20 74 6f 20 63 | 6f 6d 70 61 72 65 3a 20 |r B to c|ompare: |
|00001670| 22 20 28 70 72 6f 67 6e | 20 28 73 61 76 65 2d 77 |" (progn| (save-w|
|00001680| 69 6e 64 6f 77 2d 65 78 | 63 75 72 73 69 6f 6e 20 |indow-ex|cursion |
|00001690| 28 6f 74 68 65 72 2d 77 | 69 6e 64 6f 77 20 31 29 |(other-w|indow 1)|
|000016a0| 29 20 28 65 64 69 66 66 | 2d 6f 74 68 65 72 2d 62 |) (ediff|-other-b|
|000016b0| 75 66 66 65 72 20 62 66 | 29 29 20 74 29 29 20 28 |uffer bf|)) t)) (|
|000016c0| 72 65 61 64 2d 62 75 66 | 66 65 72 20 22 42 75 66 |read-buf|fer "Buf|
|000016d0| 66 65 72 20 43 20 74 6f | 20 63 6f 6d 70 61 72 65 |fer C to| compare|
|000016e0| 3a 20 22 20 28 70 72 6f | 67 6e 20 28 73 61 76 65 |: " (pro|gn (save|
|000016f0| 2d 77 69 6e 64 6f 77 2d | 65 78 63 75 72 73 69 6f |-window-|excursio|
|00001700| 6e 20 28 6f 74 68 65 72 | 2d 77 69 6e 64 6f 77 20 |n (other|-window |
|00001710| 31 29 29 20 28 65 64 69 | 66 66 2d 6f 74 68 65 72 |1)) (edi|ff-other|
|00001720| 2d 62 75 66 66 65 72 20 | 28 6c 69 73 74 20 62 66 |-buffer |(list bf|
|00001730| 20 62 66 66 29 29 29 20 | 74 29 29 29 5d 29 0a 28 | bff))) |t)))]).(|
|00001740| 64 65 66 61 6c 69 61 73 | 20 27 65 62 75 66 66 65 |defalias| 'ebuffe|
|00001750| 72 73 33 20 27 65 64 69 | 66 66 2d 62 75 66 66 65 |rs3 'edi|ff-buffe|
|00001760| 72 73 33 29 0a 28 64 65 | 66 61 6c 69 61 73 20 27 |rs3).(de|falias '|
|00001770| 65 64 69 66 66 2d 62 75 | 66 66 65 72 73 2d 69 6e |ediff-bu|ffers-in|
|00001780| 74 65 72 6e 61 6c 20 23 | 5b 28 62 75 66 2d 41 20 |ternal #|[(buf-A |
|00001790| 62 75 66 2d 42 20 62 75 | 66 2d 43 20 73 74 61 72 |buf-B bu|f-C star|
|000017a0| 74 75 70 2d 68 6f 6f 6b | 73 20 6a 6f 62 2d 6e 61 |tup-hook|s job-na|
|000017b0| 6d 65 20 26 6f 70 74 69 | 6f 6e 61 6c 20 6d 65 72 |me &opti|onal mer|
|000017c0| 67 65 2d 62 75 66 66 65 | 72 2d 66 69 6c 65 29 20 |ge-buffe|r-file) |
|000017d0| 22 c0 c1 5c 6e 21 21 1b | c0 c1 0c 21 21 1d 0e 06 |"..\n!!.|...!!...|
|000017e0| ad 8c c1 0e 06 21 ad 86 | c7 c1 0e 06 21 21 89 1e |.....!..|....!!..|
|000017f0| 08 ad 85 c0 c1 0c 21 21 | 1e 09 ca 1e 0b ca 1e 0c |......!!|........|
|00001800| ca 1e 0d 5c 6e ab 8c c1 | 5c 6e 21 ab 87 c7 c1 5c |...\n...|\n!....\|
|00001810| 6e 21 21 ac 85 ce cf 5c | 6e 5c 22 88 0c ab 8c c1 |n!!....\|n\".....|
|00001820| 0c 21 ab 87 c7 c1 0c 21 | 21 ac 85 ce cf 0c 5c 22 |.!.....!|!.....\"|
|00001830| 88 0e 10 1e 11 0e 12 ab | 8a 0e 08 ac 86 ce cf 0e |........|........|
|00001840| 06 5c 22 88 29 0b 3b ab | 84 d3 0b 21 13 0d 3b ab |.\".).;.|...!..;.|
|00001850| 84 d3 0d 21 15 0e 09 3b | ab 86 d3 0e 09 21 16 09 |...!...;|.....!..|
|00001860| d4 5c 6e 0b 5c 22 16 0b | d4 0c 0d 5c 22 16 0c 0e |.\n.\"..|...\"...|
|00001870| 08 ab 88 d4 0e 06 0e 09 | 5c 22 16 0d d5 c1 5c 6e |........|\"....\n|
|00001880| 21 0e 0b c1 0c 21 0e 0c | 0e 08 ad 84 c1 0e 06 21 |!....!..|.......!|
|00001890| 0e 0d d6 ca d7 0e 0b 44 | d7 0e 0c 44 d8 d9 0e 0d |.......D|...D....|
|000018a0| 44 d7 0e 0d 44 45 af 05 | 0e 1a 42 d1 0e 10 42 43 |D...DE..|..B...BC|
|000018b0| 0e 1b 26 09 2e 07 87 22 | 20 5b 62 75 66 66 65 72 |..&...."| [buffer|
|000018c0| 2d 66 69 6c 65 2d 6e 61 | 6d 65 20 67 65 74 2d 62 |-file-na|me get-b|
|000018d0| 75 66 66 65 72 20 62 75 | 66 2d 41 20 62 75 66 2d |uffer bu|f-A buf-|
|000018e0| 41 2d 66 69 6c 65 2d 6e | 61 6d 65 20 62 75 66 2d |A-file-n|ame buf-|
|000018f0| 42 20 62 75 66 2d 42 2d | 66 69 6c 65 2d 6e 61 6d |B buf-B-|file-nam|
|00001900| 65 20 62 75 66 2d 43 20 | 62 75 66 66 65 72 2d 6e |e buf-C |buffer-n|
|00001910| 61 6d 65 20 62 75 66 2d | 43 2d 69 73 2d 61 6c 69 |ame buf-|C-is-ali|
|00001920| 76 65 20 62 75 66 2d 43 | 2d 66 69 6c 65 2d 6e 61 |ve buf-C|-file-na|
|00001930| 6d 65 20 6e 69 6c 20 66 | 69 6c 65 2d 41 20 66 69 |me nil f|ile-A fi|
|00001940| 6c 65 2d 42 20 66 69 6c | 65 2d 43 20 65 72 72 6f |le-B fil|e-C erro|
|00001950| 72 20 22 42 75 66 66 65 | 72 20 25 53 20 64 6f 65 |r "Buffe|r %S doe|
|00001960| 73 6e 27 74 20 65 78 69 | 73 74 22 20 6a 6f 62 2d |sn't exi|st" job-|
|00001970| 6e 61 6d 65 20 65 64 69 | 66 66 2d 6a 6f 62 2d 6e |name edi|ff-job-n|
|00001980| 61 6d 65 20 65 64 69 66 | 66 2d 33 77 61 79 2d 63 |ame edif|f-3way-c|
|00001990| 6f 6d 70 61 72 69 73 6f | 6e 2d 6a 6f 62 20 66 69 |ompariso|n-job fi|
|000019a0| 6c 65 2d 6e 61 6d 65 2d | 6e 6f 6e 64 69 72 65 63 |le-name-|nondirec|
|000019b0| 74 6f 72 79 20 65 64 69 | 66 66 2d 6d 61 6b 65 2d |tory edi|ff-make-|
|000019c0| 74 65 6d 70 2d 66 69 6c | 65 20 65 64 69 66 66 2d |temp-fil|e ediff-|
|000019d0| 73 65 74 75 70 20 6c 61 | 6d 62 64 61 20 64 65 6c |setup la|mbda del|
|000019e0| 65 74 65 2d 66 69 6c 65 | 20 69 66 20 73 74 72 69 |ete-file| if stri|
|000019f0| 6e 67 70 20 73 74 61 72 | 74 75 70 2d 68 6f 6f 6b |ngp star|tup-hook|
|00001a00| 73 20 6d 65 72 67 65 2d | 62 75 66 66 65 72 2d 66 |s merge-|buffer-f|
|00001a10| 69 6c 65 5d 20 31 36 5d | 29 0a 28 64 65 66 61 6c |ile] 16]|).(defal|
|00001a20| 69 61 73 20 27 65 64 69 | 66 66 2d 67 65 74 2d 64 |ias 'edi|ff-get-d|
|00001a30| 65 66 61 75 6c 74 2d 64 | 69 72 65 63 74 6f 72 79 |efault-d|irectory|
|00001a40| 2d 6e 61 6d 65 20 23 5b | 6e 69 6c 20 22 08 ab 82 |-name #[|nil "...|
|00001a50| 09 87 5c 6e c3 61 ab 98 | c4 c5 c6 5c 22 89 1e 07 |..\n.a..|...\"...|
|00001a60| 3b ab 8a c8 0e 07 21 ab | 84 0e 07 aa 82 0e 09 29 |;.....!.|.......)|
|00001a70| 87 0e 09 87 22 20 5b 65 | 64 69 66 66 2d 75 73 65 |...." [e|diff-use|
|00001a80| 2d 6c 61 73 74 2d 64 69 | 72 20 65 64 69 66 66 2d |-last-di|r ediff-|
|00001a90| 6c 61 73 74 2d 64 69 72 | 2d 41 20 6d 61 6a 6f 72 |last-dir|-A major|
|00001aa0| 2d 6d 6f 64 65 20 64 69 | 72 65 64 2d 6d 6f 64 65 |-mode di|red-mode|
|00001ab0| 20 64 69 72 65 64 2d 67 | 65 74 2d 66 69 6c 65 6e | dired-g|et-filen|
|00001ac0| 61 6d 65 20 6e 69 6c 20 | 6e 6f 65 72 72 6f 72 20 |ame nil |noerror |
|00001ad0| 66 20 66 69 6c 65 2d 64 | 69 72 65 63 74 6f 72 79 |f file-d|irectory|
|00001ae0| 2d 70 20 64 65 66 61 75 | 6c 74 2d 64 69 72 65 63 |-p defau|lt-direc|
|00001af0| 74 6f 72 79 5d 20 34 5d | 29 0a 23 40 32 30 34 20 |tory] 4]|).#@204 |
|00001b00| 52 75 6e 20 45 64 69 66 | 66 20 6f 6e 20 61 20 70 |Run Edif|f on a p|
|00001b10| 61 69 72 20 6f 66 20 64 | 69 72 65 63 74 6f 72 69 |air of d|irectori|
|00001b20| 65 73 2c 20 44 49 52 31 | 20 61 6e 64 20 44 49 52 |es, DIR1| and DIR|
|00001b30| 32 2c 20 63 6f 6d 70 61 | 72 69 6e 67 20 66 69 6c |2, compa|ring fil|
|00001b40| 65 73 20 74 68 61 74 20 | 68 61 76 65 0a 74 68 65 |es that |have.the|
|00001b50| 20 73 61 6d 65 20 6e 61 | 6d 65 20 69 6e 20 62 6f | same na|me in bo|
|00001b60| 74 68 2e 20 54 68 65 20 | 74 68 69 72 64 20 61 72 |th. The |third ar|
|00001b70| 67 75 6d 65 6e 74 2c 20 | 52 45 47 45 58 50 2c 20 |gument, |REGEXP, |
|00001b80| 69 73 20 61 20 72 65 67 | 75 6c 61 72 20 65 78 70 |is a reg|ular exp|
|00001b90| 72 65 73 73 69 6f 6e 20 | 74 68 61 74 0a 63 61 6e |ression |that.can|
|00001ba0| 20 62 65 20 75 73 65 64 | 20 74 6f 20 66 69 6c 74 | be used| to filt|
|00001bb0| 65 72 20 6f 75 74 20 63 | 65 72 74 61 69 6e 20 66 |er out c|ertain f|
|00001bc0| 69 6c 65 20 6e 61 6d 65 | 73 2e 1f 0a 28 64 65 66 |ile name|s...(def|
|00001bd0| 61 6c 69 61 73 20 27 65 | 64 69 66 66 2d 64 69 72 |alias 'e|diff-dir|
|00001be0| 65 63 74 6f 72 69 65 73 | 20 23 5b 28 64 69 72 31 |ectories| #[(dir1|
|00001bf0| 20 64 69 72 32 20 72 65 | 67 65 78 70 29 20 22 c0 | dir2 re|gexp) ".|
|00001c00| 09 5c 6e c3 0c c5 c6 26 | 06 87 22 20 5b 65 64 69 |.\n....&|.." [edi|
|00001c10| 66 66 2d 64 69 72 65 63 | 74 6f 72 69 65 73 2d 69 |ff-direc|tories-i|
|00001c20| 6e 74 65 72 6e 61 6c 20 | 64 69 72 31 20 64 69 72 |nternal |dir1 dir|
|00001c30| 32 20 6e 69 6c 20 72 65 | 67 65 78 70 20 65 64 69 |2 nil re|gexp edi|
|00001c40| 66 66 2d 66 69 6c 65 73 | 20 65 64 69 66 66 2d 64 |ff-files| ediff-d|
|00001c50| 69 72 65 63 74 6f 72 69 | 65 73 5d 20 37 20 28 23 |irectori|es] 7 (#|
|00001c60| 24 20 2e 20 36 39 31 32 | 29 20 28 6c 65 74 20 28 |$ . 6912|) (let (|
|00001c70| 28 64 69 72 2d 41 20 28 | 65 64 69 66 66 2d 67 65 |(dir-A (|ediff-ge|
|00001c80| 74 2d 64 65 66 61 75 6c | 74 2d 64 69 72 65 63 74 |t-defaul|t-direct|
|00001c90| 6f 72 79 2d 6e 61 6d 65 | 29 29 20 66 29 20 28 6c |ory-name|)) f) (l|
|00001ca0| 69 73 74 20 28 73 65 74 | 71 20 66 20 28 65 64 69 |ist (set|q f (edi|
|00001cb0| 66 66 2d 72 65 61 64 2d | 66 69 6c 65 2d 6e 61 6d |ff-read-|file-nam|
|00001cc0| 65 20 22 44 69 72 65 63 | 74 6f 72 79 20 41 20 74 |e "Direc|tory A t|
|00001cd0| 6f 20 63 6f 6d 70 61 72 | 65 3a 22 20 64 69 72 2d |o compar|e:" dir-|
|00001ce0| 41 20 6e 69 6c 29 29 20 | 28 65 64 69 66 66 2d 72 |A nil)) |(ediff-r|
|00001cf0| 65 61 64 2d 66 69 6c 65 | 2d 6e 61 6d 65 20 22 44 |ead-file|-name "D|
|00001d00| 69 72 65 63 74 6f 72 79 | 20 42 20 74 6f 20 63 6f |irectory| B to co|
|00001d10| 6d 70 61 72 65 3a 22 20 | 28 69 66 20 65 64 69 66 |mpare:" |(if edif|
|00001d20| 66 2d 75 73 65 2d 6c 61 | 73 74 2d 64 69 72 20 65 |f-use-la|st-dir e|
|00001d30| 64 69 66 66 2d 6c 61 73 | 74 2d 64 69 72 2d 42 20 |diff-las|t-dir-B |
|00001d40| 28 65 64 69 66 66 2d 73 | 74 72 69 70 2d 6c 61 73 |(ediff-s|trip-las|
|00001d50| 74 2d 64 69 72 20 66 29 | 29 20 6e 69 6c 29 20 28 |t-dir f)|) nil) (|
|00001d60| 72 65 61 64 2d 73 74 72 | 69 6e 67 20 22 46 69 6c |read-str|ing "Fil|
|00001d70| 74 65 72 20 74 68 72 6f | 75 67 68 20 72 65 67 75 |ter thro|ugh regu|
|00001d80| 6c 61 72 20 65 78 70 72 | 65 73 73 69 6f 6e 3a 20 |lar expr|ession: |
|00001d90| 22 20 6e 69 6c 20 27 65 | 64 69 66 66 2d 66 69 6c |" nil 'e|diff-fil|
|00001da0| 74 65 72 69 6e 67 2d 72 | 65 67 65 78 70 2d 68 69 |tering-r|egexp-hi|
|00001db0| 73 74 6f 72 79 29 29 29 | 5d 29 0a 28 64 65 66 61 |story)))|]).(defa|
|00001dc0| 6c 69 61 73 20 27 65 64 | 69 72 73 20 27 65 64 69 |lias 'ed|irs 'edi|
|00001dd0| 66 66 2d 64 69 72 65 63 | 74 6f 72 69 65 73 29 0a |ff-direc|tories).|
|00001de0| 23 40 32 32 38 20 52 75 | 6e 20 45 64 69 66 66 20 |#@228 Ru|n Ediff |
|00001df0| 6f 6e 20 61 20 64 69 72 | 65 63 74 6f 72 79 2c 20 |on a dir|ectory, |
|00001e00| 44 49 52 31 2c 20 63 6f | 6d 70 61 72 69 6e 67 20 |DIR1, co|mparing |
|00001e10| 69 74 73 20 66 69 6c 65 | 73 20 77 69 74 68 20 74 |its file|s with t|
|00001e20| 68 65 69 72 20 72 65 76 | 69 73 69 6f 6e 73 2e 0a |heir rev|isions..|
|00001e30| 54 68 65 20 73 65 63 6f | 6e 64 20 61 72 67 75 6d |The seco|nd argum|
|00001e40| 65 6e 74 2c 20 52 45 47 | 45 58 50 2c 20 69 73 20 |ent, REG|EXP, is |
|00001e50| 61 20 72 65 67 75 6c 61 | 72 20 65 78 70 72 65 73 |a regula|r expres|
|00001e60| 73 69 6f 6e 20 74 68 61 | 74 20 66 69 6c 74 65 72 |sion tha|t filter|
|00001e70| 73 20 74 68 65 20 66 69 | 6c 65 0a 6e 61 6d 65 73 |s the fi|le.names|
|00001e80| 2e 20 4f 6e 6c 79 20 74 | 68 65 20 66 69 6c 65 73 |. Only t|he files|
|00001e90| 20 74 68 61 74 20 61 72 | 65 20 75 6e 64 65 72 20 | that ar|e under |
|00001ea0| 72 65 76 69 73 69 6f 6e | 20 63 6f 6e 74 72 6f 6c |revision| control|
|00001eb0| 20 61 72 65 20 74 61 6b | 65 6e 20 69 6e 74 6f 20 | are tak|en into |
|00001ec0| 61 63 63 6f 75 6e 74 2e | 1f 0a 28 64 65 66 61 6c |account.|..(defal|
|00001ed0| 69 61 73 20 27 65 64 69 | 66 66 2d 64 69 72 65 63 |ias 'edi|ff-direc|
|00001ee0| 74 6f 72 79 2d 72 65 76 | 69 73 69 6f 6e 73 20 23 |tory-rev|isions #|
|00001ef0| 5b 28 64 69 72 31 20 72 | 65 67 65 78 70 29 20 22 |[(dir1 r|egexp) "|
|00001f00| c0 09 5c 6e c3 c4 24 87 | 22 20 5b 65 64 69 66 66 |..\n..$.|" [ediff|
|00001f10| 2d 64 69 72 65 63 74 6f | 72 79 2d 72 65 76 69 73 |-directo|ry-revis|
|00001f20| 69 6f 6e 73 2d 69 6e 74 | 65 72 6e 61 6c 20 64 69 |ions-int|ernal di|
|00001f30| 72 31 20 72 65 67 65 78 | 70 20 65 64 69 66 66 2d |r1 regex|p ediff-|
|00001f40| 72 65 76 69 73 69 6f 6e | 20 65 64 69 66 66 2d 64 |revision| ediff-d|
|00001f50| 69 72 65 63 74 6f 72 79 | 2d 72 65 76 69 73 69 6f |irectory|-revisio|
|00001f60| 6e 73 5d 20 35 20 28 23 | 24 20 2e 20 37 36 35 34 |ns] 5 (#|$ . 7654|
|00001f70| 29 20 28 6c 65 74 20 28 | 28 64 69 72 2d 41 20 28 |) (let (|(dir-A (|
|00001f80| 65 64 69 66 66 2d 67 65 | 74 2d 64 65 66 61 75 6c |ediff-ge|t-defaul|
|00001f90| 74 2d 64 69 72 65 63 74 | 6f 72 79 2d 6e 61 6d 65 |t-direct|ory-name|
|00001fa0| 29 29 29 20 28 6c 69 73 | 74 20 28 65 64 69 66 66 |))) (lis|t (ediff|
|00001fb0| 2d 72 65 61 64 2d 66 69 | 6c 65 2d 6e 61 6d 65 20 |-read-fi|le-name |
|00001fc0| 22 44 69 72 65 63 74 6f | 72 79 20 74 6f 20 63 6f |"Directo|ry to co|
|00001fd0| 6d 70 61 72 65 20 77 69 | 74 68 20 72 65 76 69 73 |mpare wi|th revis|
|00001fe0| 69 6f 6e 3a 22 20 64 69 | 72 2d 41 20 6e 69 6c 29 |ion:" di|r-A nil)|
|00001ff0| 20 28 72 65 61 64 2d 73 | 74 72 69 6e 67 20 22 46 | (read-s|tring "F|
|00002000| 69 6c 74 65 72 20 74 68 | 72 6f 75 67 68 20 72 65 |ilter th|rough re|
|00002010| 67 75 6c 61 72 20 65 78 | 70 72 65 73 73 69 6f 6e |gular ex|pression|
|00002020| 3a 20 22 20 6e 69 6c 20 | 27 65 64 69 66 66 2d 66 |: " nil |'ediff-f|
|00002030| 69 6c 74 65 72 69 6e 67 | 2d 72 65 67 65 78 70 2d |iltering|-regexp-|
|00002040| 68 69 73 74 6f 72 79 29 | 29 29 5d 29 0a 28 64 65 |history)|))]).(de|
|00002050| 66 61 6c 69 61 73 20 27 | 65 64 69 72 2d 72 65 76 |falias '|edir-rev|
|00002060| 69 73 69 6f 6e 73 20 27 | 65 64 69 66 66 2d 64 69 |isions '|ediff-di|
|00002070| 72 65 63 74 6f 72 79 2d | 72 65 76 69 73 69 6f 6e |rectory-|revision|
|00002080| 73 29 0a 23 40 32 31 31 | 20 52 75 6e 20 45 64 69 |s).#@211| Run Edi|
|00002090| 66 66 20 6f 6e 20 74 68 | 72 65 65 20 64 69 72 65 |ff on th|ree dire|
|000020a0| 63 74 6f 72 69 65 73 2c | 20 44 49 52 31 2c 20 44 |ctories,| DIR1, D|
|000020b0| 49 52 32 2c 20 61 6e 64 | 20 44 49 52 33 2c 20 63 |IR2, and| DIR3, c|
|000020c0| 6f 6d 70 61 72 69 6e 67 | 20 66 69 6c 65 73 20 74 |omparing| files t|
|000020d0| 68 61 74 0a 68 61 76 65 | 20 74 68 65 20 73 61 6d |hat.have| the sam|
|000020e0| 65 20 6e 61 6d 65 20 69 | 6e 20 61 6c 6c 20 74 68 |e name i|n all th|
|000020f0| 72 65 65 2e 20 54 68 65 | 20 6c 61 73 74 20 61 72 |ree. The| last ar|
|00002100| 67 75 6d 65 6e 74 2c 20 | 52 45 47 45 58 50 2c 20 |gument, |REGEXP, |
|00002110| 69 73 20 61 20 72 65 67 | 75 6c 61 72 0a 65 78 70 |is a reg|ular.exp|
|00002120| 72 65 73 73 69 6f 6e 20 | 74 68 61 74 20 63 61 6e |ression |that can|
|00002130| 20 62 65 20 75 73 65 64 | 20 74 6f 20 66 69 6c 74 | be used| to filt|
|00002140| 65 72 20 6f 75 74 20 63 | 65 72 74 61 69 6e 20 66 |er out c|ertain f|
|00002150| 69 6c 65 20 6e 61 6d 65 | 73 2e 1f 0a 28 64 65 66 |ile name|s...(def|
|00002160| 61 6c 69 61 73 20 27 65 | 64 69 66 66 2d 64 69 72 |alias 'e|diff-dir|
|00002170| 65 63 74 6f 72 69 65 73 | 33 20 23 5b 28 64 69 72 |ectories|3 #[(dir|
|00002180| 31 20 64 69 72 32 20 64 | 69 72 33 20 72 65 67 65 |1 dir2 d|ir3 rege|
|00002190| 78 70 29 20 22 c0 09 5c | 6e 0b 0c c5 c6 26 06 87 |xp) "..\|n....&..|
|000021a0| 22 20 5b 65 64 69 66 66 | 2d 64 69 72 65 63 74 6f |" [ediff|-directo|
|000021b0| 72 69 65 73 2d 69 6e 74 | 65 72 6e 61 6c 20 64 69 |ries-int|ernal di|
|000021c0| 72 31 20 64 69 72 32 20 | 64 69 72 33 20 72 65 67 |r1 dir2 |dir3 reg|
|000021d0| 65 78 70 20 65 64 69 66 | 66 2d 66 69 6c 65 73 33 |exp edif|f-files3|
|000021e0| 20 65 64 69 66 66 2d 64 | 69 72 65 63 74 6f 72 69 | ediff-d|irectori|
|000021f0| 65 73 33 5d 20 37 20 28 | 23 24 20 2e 20 38 33 32 |es3] 7 (|#$ . 832|
|00002200| 39 29 20 28 6c 65 74 20 | 28 28 64 69 72 2d 41 20 |9) (let |((dir-A |
|00002210| 28 65 64 69 66 66 2d 67 | 65 74 2d 64 65 66 61 75 |(ediff-g|et-defau|
|00002220| 6c 74 2d 64 69 72 65 63 | 74 6f 72 79 2d 6e 61 6d |lt-direc|tory-nam|
|00002230| 65 29 29 20 66 29 20 28 | 6c 69 73 74 20 28 73 65 |e)) f) (|list (se|
|00002240| 74 71 20 66 20 28 65 64 | 69 66 66 2d 72 65 61 64 |tq f (ed|iff-read|
|00002250| 2d 66 69 6c 65 2d 6e 61 | 6d 65 20 22 44 69 72 65 |-file-na|me "Dire|
|00002260| 63 74 6f 72 79 20 41 20 | 74 6f 20 63 6f 6d 70 61 |ctory A |to compa|
|00002270| 72 65 3a 22 20 64 69 72 | 2d 41 20 6e 69 6c 29 29 |re:" dir|-A nil))|
|00002280| 20 28 73 65 74 71 20 66 | 20 28 65 64 69 66 66 2d | (setq f| (ediff-|
|00002290| 72 65 61 64 2d 66 69 6c | 65 2d 6e 61 6d 65 20 22 |read-fil|e-name "|
|000022a0| 44 69 72 65 63 74 6f 72 | 79 20 42 20 74 6f 20 63 |Director|y B to c|
|000022b0| 6f 6d 70 61 72 65 3a 22 | 20 28 69 66 20 65 64 69 |ompare:"| (if edi|
|000022c0| 66 66 2d 75 73 65 2d 6c | 61 73 74 2d 64 69 72 20 |ff-use-l|ast-dir |
|000022d0| 65 64 69 66 66 2d 6c 61 | 73 74 2d 64 69 72 2d 42 |ediff-la|st-dir-B|
|000022e0| 20 28 65 64 69 66 66 2d | 73 74 72 69 70 2d 6c 61 | (ediff-|strip-la|
|000022f0| 73 74 2d 64 69 72 20 66 | 29 29 20 6e 69 6c 29 29 |st-dir f|)) nil))|
|00002300| 20 28 65 64 69 66 66 2d | 72 65 61 64 2d 66 69 6c | (ediff-|read-fil|
|00002310| 65 2d 6e 61 6d 65 20 22 | 44 69 72 65 63 74 6f 72 |e-name "|Director|
|00002320| 79 20 43 20 74 6f 20 63 | 6f 6d 70 61 72 65 3a 22 |y C to c|ompare:"|
|00002330| 20 28 69 66 20 65 64 69 | 66 66 2d 75 73 65 2d 6c | (if edi|ff-use-l|
|00002340| 61 73 74 2d 64 69 72 20 | 65 64 69 66 66 2d 6c 61 |ast-dir |ediff-la|
|00002350| 73 74 2d 64 69 72 2d 43 | 20 28 65 64 69 66 66 2d |st-dir-C| (ediff-|
|00002360| 73 74 72 69 70 2d 6c 61 | 73 74 2d 64 69 72 20 66 |strip-la|st-dir f|
|00002370| 29 29 20 6e 69 6c 29 20 | 28 72 65 61 64 2d 73 74 |)) nil) |(read-st|
|00002380| 72 69 6e 67 20 22 46 69 | 6c 74 65 72 20 74 68 72 |ring "Fi|lter thr|
|00002390| 6f 75 67 68 20 72 65 67 | 75 6c 61 72 20 65 78 70 |ough reg|ular exp|
|000023a0| 72 65 73 73 69 6f 6e 3a | 20 22 20 6e 69 6c 20 27 |ression:| " nil '|
|000023b0| 65 64 69 66 66 2d 66 69 | 6c 74 65 72 69 6e 67 2d |ediff-fi|ltering-|
|000023c0| 72 65 67 65 78 70 2d 68 | 69 73 74 6f 72 79 29 29 |regexp-h|istory))|
|000023d0| 29 5d 29 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 |)]).(def|alias 'e|
|000023e0| 64 69 72 73 33 20 27 65 | 64 69 66 66 2d 64 69 72 |dirs3 'e|diff-dir|
|000023f0| 65 63 74 6f 72 69 65 73 | 33 29 0a 23 40 32 30 32 |ectories|3).#@202|
|00002400| 20 52 75 6e 20 45 64 69 | 66 66 20 6f 6e 20 61 20 | Run Edi|ff on a |
|00002410| 70 61 69 72 20 6f 66 20 | 64 69 72 65 63 74 6f 72 |pair of |director|
|00002420| 69 65 73 2c 20 44 49 52 | 31 20 61 6e 64 20 44 49 |ies, DIR|1 and DI|
|00002430| 52 32 2c 20 6d 65 72 67 | 69 6e 67 20 66 69 6c 65 |R2, merg|ing file|
|00002440| 73 20 74 68 61 74 20 68 | 61 76 65 0a 74 68 65 20 |s that h|ave.the |
|00002450| 73 61 6d 65 20 6e 61 6d | 65 20 69 6e 20 62 6f 74 |same nam|e in bot|
|00002460| 68 2e 20 54 68 65 20 74 | 68 69 72 64 20 61 72 67 |h. The t|hird arg|
|00002470| 75 6d 65 6e 74 2c 20 52 | 45 47 45 58 50 2c 20 69 |ument, R|EGEXP, i|
|00002480| 73 20 61 20 72 65 67 75 | 6c 61 72 20 65 78 70 72 |s a regu|lar expr|
|00002490| 65 73 73 69 6f 6e 20 74 | 68 61 74 0a 63 61 6e 20 |ession t|hat.can |
|000024a0| 62 65 20 75 73 65 64 20 | 74 6f 20 66 69 6c 74 65 |be used |to filte|
|000024b0| 72 20 6f 75 74 20 63 65 | 72 74 61 69 6e 20 66 69 |r out ce|rtain fi|
|000024c0| 6c 65 20 6e 61 6d 65 73 | 2e 1f 0a 28 64 65 66 61 |le names|...(defa|
|000024d0| 6c 69 61 73 20 27 65 64 | 69 66 66 2d 6d 65 72 67 |lias 'ed|iff-merg|
|000024e0| 65 2d 64 69 72 65 63 74 | 6f 72 69 65 73 20 23 5b |e-direct|ories #[|
|000024f0| 28 64 69 72 31 20 64 69 | 72 32 20 72 65 67 65 78 |(dir1 di|r2 regex|
|00002500| 70 29 20 22 c0 09 5c 6e | c3 0c c5 c6 26 06 87 22 |p) "..\n|....&.."|
|00002510| 20 5b 65 64 69 66 66 2d | 64 69 72 65 63 74 6f 72 | [ediff-|director|
|00002520| 69 65 73 2d 69 6e 74 65 | 72 6e 61 6c 20 64 69 72 |ies-inte|rnal dir|
|00002530| 31 20 64 69 72 32 20 6e | 69 6c 20 72 65 67 65 78 |1 dir2 n|il regex|
|00002540| 70 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 66 69 |p ediff-|merge-fi|
|00002550| 6c 65 73 20 65 64 69 66 | 66 2d 6d 65 72 67 65 2d |les edif|f-merge-|
|00002560| 64 69 72 65 63 74 6f 72 | 69 65 73 5d 20 37 20 28 |director|ies] 7 (|
|00002570| 23 24 20 2e 20 39 32 31 | 37 29 20 28 6c 65 74 20 |#$ . 921|7) (let |
|00002580| 28 28 64 69 72 2d 41 20 | 28 65 64 69 66 66 2d 67 |((dir-A |(ediff-g|
|00002590| 65 74 2d 64 65 66 61 75 | 6c 74 2d 64 69 72 65 63 |et-defau|lt-direc|
|000025a0| 74 6f 72 79 2d 6e 61 6d | 65 29 29 20 66 29 20 28 |tory-nam|e)) f) (|
|000025b0| 6c 69 73 74 20 28 73 65 | 74 71 20 66 20 28 65 64 |list (se|tq f (ed|
|000025c0| 69 66 66 2d 72 65 61 64 | 2d 66 69 6c 65 2d 6e 61 |iff-read|-file-na|
|000025d0| 6d 65 20 22 44 69 72 65 | 63 74 6f 72 79 20 41 20 |me "Dire|ctory A |
|000025e0| 74 6f 20 6d 65 72 67 65 | 3a 22 20 64 69 72 2d 41 |to merge|:" dir-A|
|000025f0| 20 6e 69 6c 29 29 20 28 | 65 64 69 66 66 2d 72 65 | nil)) (|ediff-re|
|00002600| 61 64 2d 66 69 6c 65 2d | 6e 61 6d 65 20 22 44 69 |ad-file-|name "Di|
|00002610| 72 65 63 74 6f 72 79 20 | 42 20 74 6f 20 6d 65 72 |rectory |B to mer|
|00002620| 67 65 3a 22 20 28 69 66 | 20 65 64 69 66 66 2d 75 |ge:" (if| ediff-u|
|00002630| 73 65 2d 6c 61 73 74 2d | 64 69 72 20 65 64 69 66 |se-last-|dir edif|
|00002640| 66 2d 6c 61 73 74 2d 64 | 69 72 2d 42 20 28 65 64 |f-last-d|ir-B (ed|
|00002650| 69 66 66 2d 73 74 72 69 | 70 2d 6c 61 73 74 2d 64 |iff-stri|p-last-d|
|00002660| 69 72 20 66 29 29 20 6e | 69 6c 29 20 28 72 65 61 |ir f)) n|il) (rea|
|00002670| 64 2d 73 74 72 69 6e 67 | 20 22 46 69 6c 74 65 72 |d-string| "Filter|
|00002680| 20 74 68 72 6f 75 67 68 | 20 72 65 67 75 6c 61 72 | through| regular|
|00002690| 20 65 78 70 72 65 73 73 | 69 6f 6e 3a 20 22 20 6e | express|ion: " n|
|000026a0| 69 6c 20 27 65 64 69 66 | 66 2d 66 69 6c 74 65 72 |il 'edif|f-filter|
|000026b0| 69 6e 67 2d 72 65 67 65 | 78 70 2d 68 69 73 74 6f |ing-rege|xp-histo|
|000026c0| 72 79 29 29 29 5d 29 0a | 28 64 65 66 61 6c 69 61 |ry)))]).|(defalia|
|000026d0| 73 20 27 65 64 69 72 73 | 2d 6d 65 72 67 65 20 27 |s 'edirs|-merge '|
|000026e0| 65 64 69 66 66 2d 6d 65 | 72 67 65 2d 64 69 72 65 |ediff-me|rge-dire|
|000026f0| 63 74 6f 72 69 65 73 29 | 0a 23 40 33 36 31 20 4d |ctories)|.#@361 M|
|00002700| 65 72 67 65 20 66 69 6c | 65 73 20 69 6e 20 64 69 |erge fil|es in di|
|00002710| 72 65 63 74 6f 72 69 65 | 73 20 44 49 52 31 20 61 |rectorie|s DIR1 a|
|00002720| 6e 64 20 44 49 52 32 20 | 75 73 69 6e 67 20 66 69 |nd DIR2 |using fi|
|00002730| 6c 65 73 20 69 6e 20 41 | 4e 43 45 53 54 4f 52 2d |les in A|NCESTOR-|
|00002740| 44 49 52 20 61 73 20 61 | 6e 63 65 73 74 6f 72 73 |DIR as a|ncestors|
|00002750| 2e 0a 45 64 69 66 66 20 | 6d 65 72 67 65 73 20 66 |..Ediff |merges f|
|00002760| 69 6c 65 73 20 74 68 61 | 74 20 68 61 76 65 20 69 |iles tha|t have i|
|00002770| 64 65 6e 74 69 63 61 6c | 20 6e 61 6d 65 73 20 69 |dentical| names i|
|00002780| 6e 20 44 49 52 31 2c 20 | 44 49 52 32 2e 20 49 66 |n DIR1, |DIR2. If|
|00002790| 20 61 20 70 61 69 72 20 | 6f 66 20 66 69 6c 65 73 | a pair |of files|
|000027a0| 0a 69 6e 20 44 49 52 31 | 20 61 6e 64 20 44 49 52 |.in DIR1| and DIR|
|000027b0| 32 20 64 6f 65 73 6e 27 | 74 20 68 61 76 65 20 61 |2 doesn'|t have a|
|000027c0| 6e 20 61 6e 63 65 73 74 | 6f 72 20 69 6e 20 41 4e |n ancest|or in AN|
|000027d0| 43 45 53 54 4f 52 2d 44 | 49 52 2c 20 45 64 69 66 |CESTOR-D|IR, Edif|
|000027e0| 66 20 77 69 6c 6c 20 6d | 65 72 67 65 0a 77 69 74 |f will m|erge.wit|
|000027f0| 68 6f 75 74 20 61 6e 63 | 65 73 74 6f 72 2e 20 54 |hout anc|estor. T|
|00002800| 68 65 20 66 6f 75 72 74 | 68 20 61 72 67 75 6d 65 |he fourt|h argume|
|00002810| 6e 74 2c 20 52 45 47 45 | 58 50 2c 20 69 73 20 61 |nt, REGE|XP, is a|
|00002820| 20 72 65 67 75 6c 61 72 | 20 65 78 70 72 65 73 73 | regular| express|
|00002830| 69 6f 6e 20 74 68 61 74 | 0a 63 61 6e 20 62 65 20 |ion that|.can be |
|00002840| 75 73 65 64 20 74 6f 20 | 66 69 6c 74 65 72 20 6f |used to |filter o|
|00002850| 75 74 20 63 65 72 74 61 | 69 6e 20 66 69 6c 65 20 |ut certa|in file |
|00002860| 6e 61 6d 65 73 2e 1f 0a | 28 64 65 66 61 6c 69 61 |names...|(defalia|
|00002870| 73 20 27 65 64 69 66 66 | 2d 6d 65 72 67 65 2d 64 |s 'ediff|-merge-d|
|00002880| 69 72 65 63 74 6f 72 69 | 65 73 2d 77 69 74 68 2d |irectori|es-with-|
|00002890| 61 6e 63 65 73 74 6f 72 | 20 23 5b 28 64 69 72 31 |ancestor| #[(dir1|
|000028a0| 20 64 69 72 32 20 61 6e | 63 65 73 74 6f 72 2d 64 | dir2 an|cestor-d|
|000028b0| 69 72 20 72 65 67 65 78 | 70 29 20 22 c0 09 5c 6e |ir regex|p) "..\n|
|000028c0| 0b 0c c5 c6 26 06 87 22 | 20 5b 65 64 69 66 66 2d |....&.."| [ediff-|
|000028d0| 64 69 72 65 63 74 6f 72 | 69 65 73 2d 69 6e 74 65 |director|ies-inte|
|000028e0| 72 6e 61 6c 20 64 69 72 | 31 20 64 69 72 32 20 61 |rnal dir|1 dir2 a|
|000028f0| 6e 63 65 73 74 6f 72 2d | 64 69 72 20 72 65 67 65 |ncestor-|dir rege|
|00002900| 78 70 20 65 64 69 66 66 | 2d 6d 65 72 67 65 2d 66 |xp ediff|-merge-f|
|00002910| 69 6c 65 73 2d 77 69 74 | 68 2d 61 6e 63 65 73 74 |iles-wit|h-ancest|
|00002920| 6f 72 20 65 64 69 66 66 | 2d 6d 65 72 67 65 2d 64 |or ediff|-merge-d|
|00002930| 69 72 65 63 74 6f 72 69 | 65 73 2d 77 69 74 68 2d |irectori|es-with-|
|00002940| 61 6e 63 65 73 74 6f 72 | 5d 20 37 20 28 23 24 20 |ancestor|] 7 (#$ |
|00002950| 2e 20 39 39 38 33 29 20 | 28 6c 65 74 20 28 28 64 |. 9983) |(let ((d|
|00002960| 69 72 2d 41 20 28 65 64 | 69 66 66 2d 67 65 74 2d |ir-A (ed|iff-get-|
|00002970| 64 65 66 61 75 6c 74 2d | 64 69 72 65 63 74 6f 72 |default-|director|
|00002980| 79 2d 6e 61 6d 65 29 29 | 20 66 29 20 28 6c 69 73 |y-name))| f) (lis|
|00002990| 74 20 28 73 65 74 71 20 | 66 20 28 65 64 69 66 66 |t (setq |f (ediff|
|000029a0| 2d 72 65 61 64 2d 66 69 | 6c 65 2d 6e 61 6d 65 20 |-read-fi|le-name |
|000029b0| 22 44 69 72 65 63 74 6f | 72 79 20 41 20 74 6f 20 |"Directo|ry A to |
|000029c0| 6d 65 72 67 65 3a 22 20 | 64 69 72 2d 41 20 6e 69 |merge:" |dir-A ni|
|000029d0| 6c 29 29 20 28 73 65 74 | 71 20 66 20 28 65 64 69 |l)) (set|q f (edi|
|000029e0| 66 66 2d 72 65 61 64 2d | 66 69 6c 65 2d 6e 61 6d |ff-read-|file-nam|
|000029f0| 65 20 22 44 69 72 65 63 | 74 6f 72 79 20 42 20 74 |e "Direc|tory B t|
|00002a00| 6f 20 6d 65 72 67 65 3a | 22 20 28 69 66 20 65 64 |o merge:|" (if ed|
|00002a10| 69 66 66 2d 75 73 65 2d | 6c 61 73 74 2d 64 69 72 |iff-use-|last-dir|
|00002a20| 20 65 64 69 66 66 2d 6c | 61 73 74 2d 64 69 72 2d | ediff-l|ast-dir-|
|00002a30| 42 20 28 65 64 69 66 66 | 2d 73 74 72 69 70 2d 6c |B (ediff|-strip-l|
|00002a40| 61 73 74 2d 64 69 72 20 | 66 29 29 20 6e 69 6c 29 |ast-dir |f)) nil)|
|00002a50| 29 20 28 65 64 69 66 66 | 2d 72 65 61 64 2d 66 69 |) (ediff|-read-fi|
|00002a60| 6c 65 2d 6e 61 6d 65 20 | 22 41 6e 63 65 73 74 6f |le-name |"Ancesto|
|00002a70| 72 20 64 69 72 65 63 74 | 6f 72 79 3a 22 20 28 69 |r direct|ory:" (i|
|00002a80| 66 20 65 64 69 66 66 2d | 75 73 65 2d 6c 61 73 74 |f ediff-|use-last|
|00002a90| 2d 64 69 72 20 65 64 69 | 66 66 2d 6c 61 73 74 2d |-dir edi|ff-last-|
|00002aa0| 64 69 72 2d 43 20 28 65 | 64 69 66 66 2d 73 74 72 |dir-C (e|diff-str|
|00002ab0| 69 70 2d 6c 61 73 74 2d | 64 69 72 20 66 29 29 20 |ip-last-|dir f)) |
|00002ac0| 6e 69 6c 29 20 28 72 65 | 61 64 2d 73 74 72 69 6e |nil) (re|ad-strin|
|00002ad0| 67 20 22 46 69 6c 74 65 | 72 20 74 68 72 6f 75 67 |g "Filte|r throug|
|00002ae0| 68 20 72 65 67 75 6c 61 | 72 20 65 78 70 72 65 73 |h regula|r expres|
|00002af0| 73 69 6f 6e 3a 20 22 20 | 6e 69 6c 20 27 65 64 69 |sion: " |nil 'edi|
|00002b00| 66 66 2d 66 69 6c 74 65 | 72 69 6e 67 2d 72 65 67 |ff-filte|ring-reg|
|00002b10| 65 78 70 2d 68 69 73 74 | 6f 72 79 29 29 29 5d 29 |exp-hist|ory)))])|
|00002b20| 0a 23 40 32 32 36 20 52 | 75 6e 20 45 64 69 66 66 |.#@226 R|un Ediff|
|00002b30| 20 6f 6e 20 61 20 64 69 | 72 65 63 74 6f 72 79 2c | on a di|rectory,|
|00002b40| 20 44 49 52 31 2c 20 6d | 65 72 67 69 6e 67 20 69 | DIR1, m|erging i|
|00002b50| 74 73 20 66 69 6c 65 73 | 20 77 69 74 68 20 74 68 |ts files| with th|
|00002b60| 65 69 72 20 72 65 76 69 | 73 69 6f 6e 73 2e 0a 54 |eir revi|sions..T|
|00002b70| 68 65 20 73 65 63 6f 6e | 64 20 61 72 67 75 6d 65 |he secon|d argume|
|00002b80| 6e 74 2c 20 52 45 47 45 | 58 50 2c 20 69 73 20 61 |nt, REGE|XP, is a|
|00002b90| 20 72 65 67 75 6c 61 72 | 20 65 78 70 72 65 73 73 | regular| express|
|00002ba0| 69 6f 6e 20 74 68 61 74 | 20 66 69 6c 74 65 72 73 |ion that| filters|
|00002bb0| 20 74 68 65 20 66 69 6c | 65 0a 6e 61 6d 65 73 2e | the fil|e.names.|
|00002bc0| 20 4f 6e 6c 79 20 74 68 | 65 20 66 69 6c 65 73 20 | Only th|e files |
|00002bd0| 74 68 61 74 20 61 72 65 | 20 75 6e 64 65 72 20 72 |that are| under r|
|00002be0| 65 76 69 73 69 6f 6e 20 | 63 6f 6e 74 72 6f 6c 20 |evision |control |
|00002bf0| 61 72 65 20 74 61 6b 65 | 6e 20 69 6e 74 6f 20 61 |are take|n into a|
|00002c00| 63 63 6f 75 6e 74 2e 1f | 0a 28 64 65 66 61 6c 69 |ccount..|.(defali|
|00002c10| 61 73 20 27 65 64 69 66 | 66 2d 6d 65 72 67 65 2d |as 'edif|f-merge-|
|00002c20| 64 69 72 65 63 74 6f 72 | 79 2d 72 65 76 69 73 69 |director|y-revisi|
|00002c30| 6f 6e 73 20 23 5b 28 64 | 69 72 31 20 72 65 67 65 |ons #[(d|ir1 rege|
|00002c40| 78 70 29 20 22 c0 09 5c | 6e c3 c4 24 87 22 20 5b |xp) "..\|n..$." [|
|00002c50| 65 64 69 66 66 2d 64 69 | 72 65 63 74 6f 72 79 2d |ediff-di|rectory-|
|00002c60| 72 65 76 69 73 69 6f 6e | 73 2d 69 6e 74 65 72 6e |revision|s-intern|
|00002c70| 61 6c 20 64 69 72 31 20 | 72 65 67 65 78 70 20 65 |al dir1 |regexp e|
|00002c80| 64 69 66 66 2d 6d 65 72 | 67 65 2d 72 65 76 69 73 |diff-mer|ge-revis|
|00002c90| 69 6f 6e 73 20 65 64 69 | 66 66 2d 6d 65 72 67 65 |ions edi|ff-merge|
|00002ca0| 2d 64 69 72 65 63 74 6f | 72 79 2d 72 65 76 69 73 |-directo|ry-revis|
|00002cb0| 69 6f 6e 73 5d 20 35 20 | 28 23 24 20 2e 20 31 31 |ions] 5 |(#$ . 11|
|00002cc0| 30 34 37 29 20 28 6c 65 | 74 20 28 28 64 69 72 2d |047) (le|t ((dir-|
|00002cd0| 41 20 28 65 64 69 66 66 | 2d 67 65 74 2d 64 65 66 |A (ediff|-get-def|
|00002ce0| 61 75 6c 74 2d 64 69 72 | 65 63 74 6f 72 79 2d 6e |ault-dir|ectory-n|
|00002cf0| 61 6d 65 29 29 29 20 28 | 6c 69 73 74 20 28 65 64 |ame))) (|list (ed|
|00002d00| 69 66 66 2d 72 65 61 64 | 2d 66 69 6c 65 2d 6e 61 |iff-read|-file-na|
|00002d10| 6d 65 20 22 44 69 72 65 | 63 74 6f 72 79 20 74 6f |me "Dire|ctory to|
|00002d20| 20 6d 65 72 67 65 20 77 | 69 74 68 20 72 65 76 69 | merge w|ith revi|
|00002d30| 73 69 6f 6e 73 3a 22 20 | 64 69 72 2d 41 20 6e 69 |sions:" |dir-A ni|
|00002d40| 6c 29 20 28 72 65 61 64 | 2d 73 74 72 69 6e 67 20 |l) (read|-string |
|00002d50| 22 46 69 6c 74 65 72 20 | 74 68 72 6f 75 67 68 20 |"Filter |through |
|00002d60| 72 65 67 75 6c 61 72 20 | 65 78 70 72 65 73 73 69 |regular |expressi|
|00002d70| 6f 6e 3a 20 22 20 6e 69 | 6c 20 27 65 64 69 66 66 |on: " ni|l 'ediff|
|00002d80| 2d 66 69 6c 74 65 72 69 | 6e 67 2d 72 65 67 65 78 |-filteri|ng-regex|
|00002d90| 70 2d 68 69 73 74 6f 72 | 79 29 29 29 5d 29 0a 28 |p-histor|y)))]).(|
|00002da0| 64 65 66 61 6c 69 61 73 | 20 27 65 64 69 72 2d 6d |defalias| 'edir-m|
|00002db0| 65 72 67 65 2d 72 65 76 | 69 73 69 6f 6e 73 20 27 |erge-rev|isions '|
|00002dc0| 65 64 69 66 66 2d 6d 65 | 72 67 65 2d 64 69 72 65 |ediff-me|rge-dire|
|00002dd0| 63 74 6f 72 79 2d 72 65 | 76 69 73 69 6f 6e 73 29 |ctory-re|visions)|
|00002de0| 0a 23 40 32 34 30 20 52 | 75 6e 20 45 64 69 66 66 |.#@240 R|un Ediff|
|00002df0| 20 6f 6e 20 61 20 64 69 | 72 65 63 74 6f 72 79 2c | on a di|rectory,|
|00002e00| 20 44 49 52 31 2c 20 6d | 65 72 67 69 6e 67 20 69 | DIR1, m|erging i|
|00002e10| 74 73 20 66 69 6c 65 73 | 20 77 69 74 68 20 74 68 |ts files| with th|
|00002e20| 65 69 72 20 72 65 76 69 | 73 69 6f 6e 73 20 61 6e |eir revi|sions an|
|00002e30| 64 20 61 6e 63 65 73 74 | 6f 72 73 2e 0a 54 68 65 |d ancest|ors..The|
|00002e40| 20 73 65 63 6f 6e 64 20 | 61 72 67 75 6d 65 6e 74 | second |argument|
|00002e50| 2c 20 52 45 47 45 58 50 | 2c 20 69 73 20 61 20 72 |, REGEXP|, is a r|
|00002e60| 65 67 75 6c 61 72 20 65 | 78 70 72 65 73 73 69 6f |egular e|xpressio|
|00002e70| 6e 20 74 68 61 74 20 66 | 69 6c 74 65 72 73 20 74 |n that f|ilters t|
|00002e80| 68 65 20 66 69 6c 65 0a | 6e 61 6d 65 73 2e 20 4f |he file.|names. O|
|00002e90| 6e 6c 79 20 74 68 65 20 | 66 69 6c 65 73 20 74 68 |nly the |files th|
|00002ea0| 61 74 20 61 72 65 20 75 | 6e 64 65 72 20 72 65 76 |at are u|nder rev|
|00002eb0| 69 73 69 6f 6e 20 63 6f | 6e 74 72 6f 6c 20 61 72 |ision co|ntrol ar|
|00002ec0| 65 20 74 61 6b 65 6e 20 | 69 6e 74 6f 20 61 63 63 |e taken |into acc|
|00002ed0| 6f 75 6e 74 2e 1f 0a 28 | 64 65 66 61 6c 69 61 73 |ount...(|defalias|
|00002ee0| 20 27 65 64 69 66 66 2d | 6d 65 72 67 65 2d 64 69 | 'ediff-|merge-di|
|00002ef0| 72 65 63 74 6f 72 79 2d | 72 65 76 69 73 69 6f 6e |rectory-|revision|
|00002f00| 73 2d 77 69 74 68 2d 61 | 6e 63 65 73 74 6f 72 20 |s-with-a|ncestor |
|00002f10| 23 5b 28 64 69 72 31 20 | 72 65 67 65 78 70 29 20 |#[(dir1 |regexp) |
|00002f20| 22 c0 09 5c 6e c3 c4 24 | 87 22 20 5b 65 64 69 66 |"..\n..$|." [edif|
|00002f30| 66 2d 64 69 72 65 63 74 | 6f 72 79 2d 72 65 76 69 |f-direct|ory-revi|
|00002f40| 73 69 6f 6e 73 2d 69 6e | 74 65 72 6e 61 6c 20 64 |sions-in|ternal d|
|00002f50| 69 72 31 20 72 65 67 65 | 78 70 20 65 64 69 66 66 |ir1 rege|xp ediff|
|00002f60| 2d 6d 65 72 67 65 2d 72 | 65 76 69 73 69 6f 6e 73 |-merge-r|evisions|
|00002f70| 2d 77 69 74 68 2d 61 6e | 63 65 73 74 6f 72 20 65 |-with-an|cestor e|
|00002f80| 64 69 66 66 2d 6d 65 72 | 67 65 2d 64 69 72 65 63 |diff-mer|ge-direc|
|00002f90| 74 6f 72 79 2d 72 65 76 | 69 73 69 6f 6e 73 2d 77 |tory-rev|isions-w|
|00002fa0| 69 74 68 2d 61 6e 63 65 | 73 74 6f 72 5d 20 35 20 |ith-ance|stor] 5 |
|00002fb0| 28 23 24 20 2e 20 31 31 | 37 35 31 29 20 28 6c 65 |(#$ . 11|751) (le|
|00002fc0| 74 20 28 28 64 69 72 2d | 41 20 28 65 64 69 66 66 |t ((dir-|A (ediff|
|00002fd0| 2d 67 65 74 2d 64 65 66 | 61 75 6c 74 2d 64 69 72 |-get-def|ault-dir|
|00002fe0| 65 63 74 6f 72 79 2d 6e | 61 6d 65 29 29 29 20 28 |ectory-n|ame))) (|
|00002ff0| 6c 69 73 74 20 28 65 64 | 69 66 66 2d 72 65 61 64 |list (ed|iff-read|
|00003000| 2d 66 69 6c 65 2d 6e 61 | 6d 65 20 22 44 69 72 65 |-file-na|me "Dire|
|00003010| 63 74 6f 72 79 20 74 6f | 20 6d 65 72 67 65 20 77 |ctory to| merge w|
|00003020| 69 74 68 20 72 65 76 69 | 73 69 6f 6e 73 20 61 6e |ith revi|sions an|
|00003030| 64 20 61 6e 63 65 73 74 | 6f 72 73 3a 22 20 64 69 |d ancest|ors:" di|
|00003040| 72 2d 41 20 6e 69 6c 29 | 20 28 72 65 61 64 2d 73 |r-A nil)| (read-s|
|00003050| 74 72 69 6e 67 20 22 46 | 69 6c 74 65 72 20 74 68 |tring "F|ilter th|
|00003060| 72 6f 75 67 68 20 72 65 | 67 75 6c 61 72 20 65 78 |rough re|gular ex|
|00003070| 70 72 65 73 73 69 6f 6e | 3a 20 22 20 6e 69 6c 20 |pression|: " nil |
|00003080| 27 65 64 69 66 66 2d 66 | 69 6c 74 65 72 69 6e 67 |'ediff-f|iltering|
|00003090| 2d 72 65 67 65 78 70 2d | 68 69 73 74 6f 72 79 29 |-regexp-|history)|
|000030a0| 29 29 5d 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |))]).(by|te-code |
|000030b0| 22 c0 c1 c2 5c 22 88 c0 | c3 c4 5c 22 87 22 20 5b |"...\"..|..\"." [|
|000030c0| 64 65 66 61 6c 69 61 73 | 20 65 64 69 72 2d 6d 65 |defalias| edir-me|
|000030d0| 72 67 65 2d 72 65 76 69 | 73 69 6f 6e 73 2d 77 69 |rge-revi|sions-wi|
|000030e0| 74 68 2d 61 6e 63 65 73 | 74 6f 72 20 65 64 69 66 |th-ances|tor edif|
|000030f0| 66 2d 6d 65 72 67 65 2d | 64 69 72 65 63 74 6f 72 |f-merge-|director|
|00003100| 79 2d 72 65 76 69 73 69 | 6f 6e 73 2d 77 69 74 68 |y-revisi|ons-with|
|00003110| 2d 61 6e 63 65 73 74 6f | 72 20 65 64 69 72 73 2d |-ancesto|r edirs-|
|00003120| 6d 65 72 67 65 2d 77 69 | 74 68 2d 61 6e 63 65 73 |merge-wi|th-ances|
|00003130| 74 6f 72 20 65 64 69 66 | 66 2d 6d 65 72 67 65 2d |tor edif|f-merge-|
|00003140| 64 69 72 65 63 74 6f 72 | 69 65 73 2d 77 69 74 68 |director|ies-with|
|00003150| 2d 61 6e 63 65 73 74 6f | 72 5d 20 33 29 0a 28 64 |-ancesto|r] 3).(d|
|00003160| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 64 |efalias |'ediff-d|
|00003170| 69 72 65 63 74 6f 72 69 | 65 73 2d 69 6e 74 65 72 |irectori|es-inter|
|00003180| 6e 61 6c 20 23 5b 28 64 | 69 72 31 20 64 69 72 32 |nal #[(d|ir1 dir2|
|00003190| 20 64 69 72 33 20 72 65 | 67 65 78 70 20 61 63 74 | dir3 re|gexp act|
|000031a0| 69 6f 6e 20 6a 6f 62 6e | 61 6d 65 20 26 6f 70 74 |ion jobn|ame &opt|
|000031b0| 69 6f 6e 61 6c 20 73 74 | 61 72 74 75 70 2d 68 6f |ional st|artup-ho|
|000031c0| 6f 6b 73 29 20 22 c0 09 | 21 ab 83 09 aa 83 c2 09 |oks) "..|!.......|
|000031d0| 21 11 c0 0b 21 ab 83 0b | aa 83 c2 0b 21 13 0c 3b |!...!...|....!..;|
|000031e0| ab 8c c0 0c 21 ab 83 0c | aa 83 c2 0c 21 14 09 0b |....!...|....!...|
|000031f0| 98 ab 87 c5 c6 09 5c 22 | 88 aa a2 0e 07 c8 61 ab |......\"|......a.|
|00003200| 8c 09 0c 98 ab 87 c5 c9 | 09 5c 22 88 aa 90 0e 07 |........|.\".....|
|00003210| c8 61 ab 8a 0b 0c 98 ab | 85 c5 ca 09 5c 22 88 cb |.a......|....\"..|
|00003220| 89 89 89 1e 0c 1e 0d 1e | 0e 1e 0f 0e 10 ab 9f 0e |........|........|
|00003230| 07 89 1e 11 ae 82 0e 12 | d3 73 29 ab 91 d4 d5 0e |........|.s).....|
|00003240| 16 ab 84 0e 17 aa 83 d8 | 09 21 cb 23 16 0e 0e 0e |........|.!.#....|
|00003250| 3b ab bd 09 3b ab 91 0e | 0e 09 98 ab 8b d9 da 21 |;...;...|.......!|
|00003260| ac ae c5 db 21 88 aa a8 | 0b 3b ab 91 0e 0e 0b 98 |....!...|.;......|
|00003270| ab 8b d9 dc 21 ac 99 c5 | db 21 88 aa 93 0c 3b ab |....!...|.!....;.|
|00003280| 8f 0e 0e 0c 98 ab 89 d9 | dd 21 ac 84 c5 db 21 88 |........|.!....!.|
|00003290| de 0e 07 cf 0e 1f 09 0b | 0c 0e 0e 26 07 16 0d e0 |........|...&....|
|000032a0| cb e1 e2 e3 0e 24 44 45 | e1 e5 e3 0e 0f 44 45 46 |.....$DE|.....DEF|
|000032b0| 0e 26 42 16 26 e7 e8 0e | 0d e9 ea 0e 07 0e 26 26 |.&B.&...|......&&|
|000032c0| 06 16 0c eb 0e 0c 21 2c | 87 22 20 5b 66 69 6c 65 |......!,|." [file|
|000032d0| 2d 64 69 72 65 63 74 6f | 72 79 2d 70 20 64 69 72 |-directo|ry-p dir|
|000032e0| 31 20 66 69 6c 65 2d 6e | 61 6d 65 2d 64 69 72 65 |1 file-n|ame-dire|
|000032f0| 63 74 6f 72 79 20 64 69 | 72 32 20 64 69 72 33 20 |ctory di|r2 dir3 |
|00003300| 65 72 72 6f 72 20 22 44 | 69 72 65 63 74 6f 72 69 |error "D|irectori|
|00003310| 65 73 20 41 20 61 6e 64 | 20 42 20 61 72 65 20 74 |es A and| B are t|
|00003320| 68 65 20 73 61 6d 65 3a | 20 25 73 22 20 6a 6f 62 |he same:| %s" job|
|00003330| 6e 61 6d 65 20 65 64 69 | 66 66 2d 64 69 72 65 63 |name edi|ff-direc|
|00003340| 74 6f 72 69 65 73 33 20 | 22 44 69 72 65 63 74 6f |tories3 |"Directo|
|00003350| 72 69 65 73 20 41 20 61 | 6e 64 20 43 20 61 72 65 |ries A a|nd C are|
|00003360| 20 74 68 65 20 73 61 6d | 65 3a 20 25 73 22 20 22 | the sam|e: %s" "|
|00003370| 44 69 72 65 63 74 6f 72 | 69 65 73 20 42 20 61 6e |Director|ies B an|
|00003380| 64 20 43 20 61 72 65 20 | 74 68 65 20 73 61 6d 65 |d C are |the same|
|00003390| 3a 20 25 73 22 20 6e 69 | 6c 20 6d 65 74 61 2d 62 |: %s" ni|l meta-b|
|000033a0| 75 66 20 66 69 6c 65 2d | 6c 69 73 74 20 6d 65 72 |uf file-|list mer|
|000033b0| 67 65 2d 61 75 74 6f 73 | 74 6f 72 65 2d 64 69 72 |ge-autos|tore-dir|
|000033c0| 20 64 69 66 66 73 20 65 | 64 69 66 66 2d 61 75 74 | diffs e|diff-aut|
|000033d0| 6f 73 74 6f 72 65 2d 6d | 65 72 67 65 73 20 6d 65 |ostore-m|erges me|
|000033e0| 74 61 6a 6f 62 20 65 64 | 69 66 66 2d 6d 65 74 61 |tajob ed|iff-meta|
|000033f0| 6a 6f 62 2d 6e 61 6d 65 | 20 28 65 64 69 66 66 2d |job-name| (ediff-|
|00003400| 6d 65 72 67 65 2d 64 69 | 72 65 63 74 6f 72 69 65 |merge-di|rectorie|
|00003410| 73 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 64 69 |s ediff-|merge-di|
|00003420| 72 65 63 74 6f 72 69 65 | 73 2d 77 69 74 68 2d 61 |rectorie|s-with-a|
|00003430| 6e 63 65 73 74 6f 72 20 | 65 64 69 66 66 2d 6d 65 |ncestor |ediff-me|
|00003440| 72 67 65 2d 64 69 72 65 | 63 74 6f 72 79 2d 72 65 |rge-dire|ctory-re|
|00003450| 76 69 73 69 6f 6e 73 20 | 65 64 69 66 66 2d 6d 65 |visions |ediff-me|
|00003460| 72 67 65 2d 64 69 72 65 | 63 74 6f 72 79 2d 72 65 |rge-dire|ctory-re|
|00003470| 76 69 73 69 6f 6e 73 2d | 77 69 74 68 2d 61 6e 63 |visions-|with-anc|
|00003480| 65 73 74 6f 72 20 65 64 | 69 66 66 2d 6d 65 72 67 |estor ed|iff-merg|
|00003490| 65 2d 66 69 6c 65 67 72 | 6f 75 70 73 2d 77 69 74 |e-filegr|oups-wit|
|000034a0| 68 2d 61 6e 63 65 73 74 | 6f 72 29 20 65 64 69 66 |h-ancest|or) edif|
|000034b0| 66 2d 72 65 61 64 2d 66 | 69 6c 65 2d 6e 61 6d 65 |f-read-f|ile-name|
|000034c0| 20 22 44 69 72 65 63 74 | 6f 72 79 20 74 6f 20 73 | "Direct|ory to s|
|000034d0| 61 76 65 20 6d 65 72 67 | 65 64 20 66 69 6c 65 73 |ave merg|ed files|
|000034e0| 3a 22 20 65 64 69 66 66 | 2d 75 73 65 2d 6c 61 73 |:" ediff|-use-las|
|000034f0| 74 2d 64 69 72 20 65 64 | 69 66 66 2d 6c 61 73 74 |t-dir ed|iff-last|
|00003500| 2d 6d 65 72 67 65 2d 61 | 75 74 6f 73 74 6f 72 65 |-merge-a|utostore|
|00003510| 2d 64 69 72 20 65 64 69 | 66 66 2d 73 74 72 69 70 |-dir edi|ff-strip|
|00003520| 2d 6c 61 73 74 2d 64 69 | 72 20 79 2d 6f 72 2d 6e |-last-di|r y-or-n|
|00003530| 2d 70 20 22 4d 65 72 67 | 65 20 64 69 72 65 63 74 |-p "Merg|e direct|
|00003540| 6f 72 79 20 73 61 6d 65 | 20 61 73 20 64 69 72 65 |ory same| as dire|
|00003550| 63 74 6f 72 79 20 41 2c | 20 73 75 72 65 3f 20 22 |ctory A,| sure? "|
|00003560| 20 22 44 69 72 65 63 74 | 6f 72 79 20 6d 65 72 67 | "Direct|ory merg|
|00003570| 65 20 61 62 6f 72 74 65 | 64 22 20 22 4d 65 72 67 |e aborte|d" "Merg|
|00003580| 65 20 64 69 72 65 63 74 | 6f 72 79 20 73 61 6d 65 |e direct|ory same|
|00003590| 20 61 73 20 64 69 72 65 | 63 74 6f 72 79 20 42 2c | as dire|ctory B,|
|000035a0| 20 73 75 72 65 3f 20 22 | 20 22 4d 65 72 67 65 20 | sure? "| "Merge |
|000035b0| 64 69 72 65 63 74 6f 72 | 79 20 73 61 6d 65 20 61 |director|y same a|
|000035c0| 73 20 61 6e 63 65 73 74 | 6f 72 20 64 69 72 65 63 |s ancest|or direc|
|000035d0| 74 6f 72 79 2c 20 73 75 | 72 65 3f 20 22 20 65 64 |tory, su|re? " ed|
|000035e0| 69 66 66 2d 69 6e 74 65 | 72 73 65 63 74 2d 64 69 |iff-inte|rsect-di|
|000035f0| 72 65 63 74 6f 72 69 65 | 73 20 72 65 67 65 78 70 |rectorie|s regexp|
|00003600| 20 6c 61 6d 62 64 61 20 | 73 65 74 71 20 65 64 69 | lambda |setq edi|
|00003610| 66 66 2d 73 65 73 73 69 | 6f 6e 2d 61 63 74 69 6f |ff-sessi|on-actio|
|00003620| 6e 2d 66 75 6e 63 74 69 | 6f 6e 20 71 75 6f 74 65 |n-functi|on quote|
|00003630| 20 61 63 74 69 6f 6e 20 | 65 64 69 66 66 2d 64 69 | action |ediff-di|
|00003640| 72 2d 64 69 66 66 65 72 | 65 6e 63 65 2d 6c 69 73 |r-differ|ence-lis|
|00003650| 74 20 73 74 61 72 74 75 | 70 2d 68 6f 6f 6b 73 20 |t startu|p-hooks |
|00003660| 65 64 69 66 66 2d 70 72 | 65 70 61 72 65 2d 6d 65 |ediff-pr|epare-me|
|00003670| 74 61 2d 62 75 66 66 65 | 72 20 65 64 69 66 66 2d |ta-buffe|r ediff-|
|00003680| 66 69 6c 65 67 72 6f 75 | 70 2d 61 63 74 69 6f 6e |filegrou|p-action|
|00003690| 20 22 2a 45 64 69 66 66 | 20 53 65 73 73 69 6f 6e | "*Ediff| Session|
|000036a0| 20 47 72 6f 75 70 20 50 | 61 6e 65 6c 22 20 65 64 | Group P|anel" ed|
|000036b0| 69 66 66 2d 72 65 64 72 | 61 77 2d 64 69 72 65 63 |iff-redr|aw-direc|
|000036c0| 74 6f 72 79 2d 67 72 6f | 75 70 2d 62 75 66 66 65 |tory-gro|up-buffe|
|000036d0| 72 20 65 64 69 66 66 2d | 73 68 6f 77 2d 6d 65 74 |r ediff-|show-met|
|000036e0| 61 2d 62 75 66 66 65 72 | 5d 20 39 5d 29 0a 28 64 |a-buffer|] 9]).(d|
|000036f0| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 64 |efalias |'ediff-d|
|00003700| 69 72 65 63 74 6f 72 79 | 2d 72 65 76 69 73 69 6f |irectory|-revisio|
|00003710| 6e 73 2d 69 6e 74 65 72 | 6e 61 6c 20 23 5b 28 64 |ns-inter|nal #[(d|
|00003720| 69 72 31 20 72 65 67 65 | 78 70 20 61 63 74 69 6f |ir1 rege|xp actio|
|00003730| 6e 20 6a 6f 62 6e 61 6d | 65 20 26 6f 70 74 69 6f |n jobnam|e &optio|
|00003740| 6e 61 6c 20 73 74 61 72 | 74 75 70 2d 68 6f 6f 6b |nal star|tup-hook|
|00003750| 73 29 20 22 c0 09 21 ab | 83 09 aa 83 c2 09 21 11 |s) "..!.|......!.|
|00003760| c3 89 89 1c 1d 1e 06 0e | 07 ab 9e 0e 08 89 1e 09 |........|........|
|00003770| ae 82 0e 5c 6e cb 73 29 | ab 90 cc cd 0e 0e ab 84 |...\n.s)|........|
|00003780| 0e 0f aa 83 d0 09 21 c3 | 23 14 0c 3b ab 92 09 3b |......!.|#..;...;|
|00003790| ab 8e 0c 09 98 ab 89 d1 | d2 21 ac 84 d3 d4 21 88 |........|.!....!.|
|000037a0| d5 0e 08 0e 16 09 0c 24 | 16 06 d7 c3 d8 d9 da 0e |.......$|........|
|000037b0| 1b 44 45 45 0e 1c 42 16 | 1c dd de 0e 06 df e0 0e |.DEE..B.|........|
|000037c0| 08 0e 1c 26 06 15 e1 0d | 21 2b 87 22 20 5b 66 69 |...&....|!+." [fi|
|000037d0| 6c 65 2d 64 69 72 65 63 | 74 6f 72 79 2d 70 20 64 |le-direc|tory-p d|
|000037e0| 69 72 31 20 66 69 6c 65 | 2d 6e 61 6d 65 2d 64 69 |ir1 file|-name-di|
|000037f0| 72 65 63 74 6f 72 79 20 | 6e 69 6c 20 6d 65 72 67 |rectory |nil merg|
|00003800| 65 2d 61 75 74 6f 73 74 | 6f 72 65 2d 64 69 72 20 |e-autost|ore-dir |
|00003810| 6d 65 74 61 2d 62 75 66 | 20 66 69 6c 65 2d 6c 69 |meta-buf| file-li|
|00003820| 73 74 20 65 64 69 66 66 | 2d 61 75 74 6f 73 74 6f |st ediff|-autosto|
|00003830| 72 65 2d 6d 65 72 67 65 | 73 20 6a 6f 62 6e 61 6d |re-merge|s jobnam|
|00003840| 65 20 6d 65 74 61 6a 6f | 62 20 65 64 69 66 66 2d |e metajo|b ediff-|
|00003850| 6d 65 74 61 6a 6f 62 2d | 6e 61 6d 65 20 28 65 64 |metajob-|name (ed|
|00003860| 69 66 66 2d 6d 65 72 67 | 65 2d 64 69 72 65 63 74 |iff-merg|e-direct|
|00003870| 6f 72 69 65 73 20 65 64 | 69 66 66 2d 6d 65 72 67 |ories ed|iff-merg|
|00003880| 65 2d 64 69 72 65 63 74 | 6f 72 69 65 73 2d 77 69 |e-direct|ories-wi|
|00003890| 74 68 2d 61 6e 63 65 73 | 74 6f 72 20 65 64 69 66 |th-ances|tor edif|
|000038a0| 66 2d 6d 65 72 67 65 2d | 64 69 72 65 63 74 6f 72 |f-merge-|director|
|000038b0| 79 2d 72 65 76 69 73 69 | 6f 6e 73 20 65 64 69 66 |y-revisi|ons edif|
|000038c0| 66 2d 6d 65 72 67 65 2d | 64 69 72 65 63 74 6f 72 |f-merge-|director|
|000038d0| 79 2d 72 65 76 69 73 69 | 6f 6e 73 2d 77 69 74 68 |y-revisi|ons-with|
|000038e0| 2d 61 6e 63 65 73 74 6f | 72 20 65 64 69 66 66 2d |-ancesto|r ediff-|
|000038f0| 6d 65 72 67 65 2d 66 69 | 6c 65 67 72 6f 75 70 73 |merge-fi|legroups|
|00003900| 2d 77 69 74 68 2d 61 6e | 63 65 73 74 6f 72 29 20 |-with-an|cestor) |
|00003910| 65 64 69 66 66 2d 72 65 | 61 64 2d 66 69 6c 65 2d |ediff-re|ad-file-|
|00003920| 6e 61 6d 65 20 22 44 69 | 72 65 63 74 6f 72 79 20 |name "Di|rectory |
|00003930| 74 6f 20 73 61 76 65 20 | 6d 65 72 67 65 64 20 66 |to save |merged f|
|00003940| 69 6c 65 73 3a 22 20 65 | 64 69 66 66 2d 75 73 65 |iles:" e|diff-use|
|00003950| 2d 6c 61 73 74 2d 64 69 | 72 20 65 64 69 66 66 2d |-last-di|r ediff-|
|00003960| 6c 61 73 74 2d 6d 65 72 | 67 65 2d 61 75 74 6f 73 |last-mer|ge-autos|
|00003970| 74 6f 72 65 2d 64 69 72 | 20 65 64 69 66 66 2d 73 |tore-dir| ediff-s|
|00003980| 74 72 69 70 2d 6c 61 73 | 74 2d 64 69 72 20 79 2d |trip-las|t-dir y-|
|00003990| 6f 72 2d 6e 2d 70 20 22 | 44 69 72 65 63 74 6f 72 |or-n-p "|Director|
|000039a0| 79 20 66 6f 72 20 73 61 | 76 69 6e 67 20 6d 65 72 |y for sa|ving mer|
|000039b0| 67 65 73 20 69 73 20 74 | 68 65 20 73 61 6d 65 20 |ges is t|he same |
|000039c0| 61 73 20 64 69 72 65 63 | 74 6f 72 79 20 41 2e 20 |as direc|tory A. |
|000039d0| 53 75 72 65 3f 20 22 20 | 65 72 72 6f 72 20 22 4d |Sure? " |error "M|
|000039e0| 65 72 67 65 20 6f 66 20 | 64 69 72 65 63 74 6f 72 |erge of |director|
|000039f0| 79 20 72 65 76 69 73 69 | 6f 6e 73 20 61 62 6f 72 |y revisi|ons abor|
|00003a00| 74 65 64 22 20 65 64 69 | 66 66 2d 67 65 74 2d 64 |ted" edi|ff-get-d|
|00003a10| 69 72 65 63 74 6f 72 79 | 2d 66 69 6c 65 73 2d 75 |irectory|-files-u|
|00003a20| 6e 64 65 72 2d 72 65 76 | 69 73 69 6f 6e 20 72 65 |nder-rev|ision re|
|00003a30| 67 65 78 70 20 6c 61 6d | 62 64 61 20 73 65 74 71 |gexp lam|bda setq|
|00003a40| 20 65 64 69 66 66 2d 73 | 65 73 73 69 6f 6e 2d 61 | ediff-s|ession-a|
|00003a50| 63 74 69 6f 6e 2d 66 75 | 6e 63 74 69 6f 6e 20 71 |ction-fu|nction q|
|00003a60| 75 6f 74 65 20 61 63 74 | 69 6f 6e 20 73 74 61 72 |uote act|ion star|
|00003a70| 74 75 70 2d 68 6f 6f 6b | 73 20 65 64 69 66 66 2d |tup-hook|s ediff-|
|00003a80| 70 72 65 70 61 72 65 2d | 6d 65 74 61 2d 62 75 66 |prepare-|meta-buf|
|00003a90| 66 65 72 20 65 64 69 66 | 66 2d 66 69 6c 65 67 72 |fer edif|f-filegr|
|00003aa0| 6f 75 70 2d 61 63 74 69 | 6f 6e 20 22 2a 45 64 69 |oup-acti|on "*Edi|
|00003ab0| 66 66 20 53 65 73 73 69 | 6f 6e 20 47 72 6f 75 70 |ff Sessi|on Group|
|00003ac0| 20 50 61 6e 65 6c 22 20 | 65 64 69 66 66 2d 72 65 | Panel" |ediff-re|
|00003ad0| 64 72 61 77 2d 64 69 72 | 65 63 74 6f 72 79 2d 67 |draw-dir|ectory-g|
|00003ae0| 72 6f 75 70 2d 62 75 66 | 66 65 72 20 65 64 69 66 |roup-buf|fer edif|
|00003af0| 66 2d 73 68 6f 77 2d 6d | 65 74 61 2d 62 75 66 66 |f-show-m|eta-buff|
|00003b00| 65 72 5d 20 38 5d 29 0a | 23 40 32 33 36 20 43 6f |er] 8]).|#@236 Co|
|00003b10| 6d 70 61 72 65 20 57 49 | 4e 44 2d 41 20 61 6e 64 |mpare WI|ND-A and|
|00003b20| 20 57 49 4e 44 2d 42 2c | 20 77 68 69 63 68 20 61 | WIND-B,| which a|
|00003b30| 72 65 20 73 65 6c 65 63 | 74 65 64 20 62 79 20 63 |re selec|ted by c|
|00003b40| 6c 69 63 6b 69 6e 67 2c | 20 77 6f 72 64 77 69 73 |licking,| wordwis|
|00003b50| 65 2e 0a 57 69 74 68 20 | 70 72 65 66 69 78 20 61 |e..With |prefix a|
|00003b60| 72 67 75 6d 65 6e 74 2c | 20 44 55 4d 42 2d 4d 4f |rgument,| DUMB-MO|
|00003b70| 44 45 2c 20 6f 72 20 6f | 6e 20 61 20 6e 6f 6e 2d |DE, or o|n a non-|
|00003b80| 77 69 6e 64 6f 77 69 6e | 67 20 64 69 73 70 6c 61 |windowin|g displa|
|00003b90| 79 2c 20 77 6f 72 6b 73 | 20 61 73 0a 66 6f 6c 6c |y, works| as.foll|
|00003ba0| 6f 77 73 3a 0a 49 66 20 | 57 49 4e 44 2d 41 20 69 |ows:.If |WIND-A i|
|00003bb0| 73 20 6e 69 6c 2c 20 75 | 73 65 20 73 65 6c 65 63 |s nil, u|se selec|
|00003bc0| 74 65 64 20 77 69 6e 64 | 6f 77 2e 0a 49 66 20 57 |ted wind|ow..If W|
|00003bd0| 49 4e 44 2d 42 20 69 73 | 20 6e 69 6c 2c 20 75 73 |IND-B is| nil, us|
|00003be0| 65 20 77 69 6e 64 6f 77 | 20 6e 65 78 74 20 74 6f |e window| next to|
|00003bf0| 20 57 49 4e 44 2d 41 2e | 1f 0a 28 64 65 66 61 6c | WIND-A.|..(defal|
|00003c00| 69 61 73 20 27 65 64 69 | 66 66 2d 77 69 6e 64 6f |ias 'edi|ff-windo|
|00003c10| 77 73 2d 77 6f 72 64 77 | 69 73 65 20 23 5b 28 64 |ws-wordw|ise #[(d|
|00003c20| 75 6d 62 2d 6d 6f 64 65 | 20 26 6f 70 74 69 6f 6e |umb-mode| &option|
|00003c30| 61 6c 20 77 69 6e 64 2d | 41 20 77 69 6e 64 2d 42 |al wind-|A wind-B|
|00003c40| 20 73 74 61 72 74 75 70 | 2d 68 6f 6f 6b 73 29 20 | startup|-hooks) |
|00003c50| 22 c0 09 5c 6e 0b 0c c5 | c6 26 06 87 22 20 5b 65 |"..\n...|.&.." [e|
|00003c60| 64 69 66 66 2d 77 69 6e | 64 6f 77 73 20 64 75 6d |diff-win|dows dum|
|00003c70| 62 2d 6d 6f 64 65 20 77 | 69 6e 64 2d 41 20 77 69 |b-mode w|ind-A wi|
|00003c80| 6e 64 2d 42 20 73 74 61 | 72 74 75 70 2d 68 6f 6f |nd-B sta|rtup-hoo|
|00003c90| 6b 73 20 65 64 69 66 66 | 2d 77 69 6e 64 6f 77 73 |ks ediff|-windows|
|00003ca0| 2d 77 6f 72 64 77 69 73 | 65 20 77 6f 72 64 2d 6d |-wordwis|e word-m|
|00003cb0| 6f 64 65 5d 20 37 20 28 | 23 24 20 2e 20 31 35 31 |ode] 7 (|#$ . 151|
|00003cc0| 31 38 29 20 22 50 22 5d | 29 0a 23 40 32 33 36 20 |18) "P"]|).#@236 |
|00003cd0| 43 6f 6d 70 61 72 65 20 | 57 49 4e 44 2d 41 20 61 |Compare |WIND-A a|
|00003ce0| 6e 64 20 57 49 4e 44 2d | 42 2c 20 77 68 69 63 68 |nd WIND-|B, which|
|00003cf0| 20 61 72 65 20 73 65 6c | 65 63 74 65 64 20 62 79 | are sel|ected by|
|00003d00| 20 63 6c 69 63 6b 69 6e | 67 2c 20 6c 69 6e 65 77 | clickin|g, linew|
|00003d10| 69 73 65 2e 0a 57 69 74 | 68 20 70 72 65 66 69 78 |ise..Wit|h prefix|
|00003d20| 20 61 72 67 75 6d 65 6e | 74 2c 20 44 55 4d 42 2d | argumen|t, DUMB-|
|00003d30| 4d 4f 44 45 2c 20 6f 72 | 20 6f 6e 20 61 20 6e 6f |MODE, or| on a no|
|00003d40| 6e 2d 77 69 6e 64 6f 77 | 69 6e 67 20 64 69 73 70 |n-window|ing disp|
|00003d50| 6c 61 79 2c 20 77 6f 72 | 6b 73 20 61 73 0a 66 6f |lay, wor|ks as.fo|
|00003d60| 6c 6c 6f 77 73 3a 0a 49 | 66 20 57 49 4e 44 2d 41 |llows:.I|f WIND-A|
|00003d70| 20 69 73 20 6e 69 6c 2c | 20 75 73 65 20 73 65 6c | is nil,| use sel|
|00003d80| 65 63 74 65 64 20 77 69 | 6e 64 6f 77 2e 0a 49 66 |ected wi|ndow..If|
|00003d90| 20 57 49 4e 44 2d 42 20 | 69 73 20 6e 69 6c 2c 20 | WIND-B |is nil, |
|00003da0| 75 73 65 20 77 69 6e 64 | 6f 77 20 6e 65 78 74 20 |use wind|ow next |
|00003db0| 74 6f 20 57 49 4e 44 2d | 41 2e 1f 0a 28 64 65 66 |to WIND-|A...(def|
|00003dc0| 61 6c 69 61 73 20 27 65 | 64 69 66 66 2d 77 69 6e |alias 'e|diff-win|
|00003dd0| 64 6f 77 73 2d 6c 69 6e | 65 77 69 73 65 20 23 5b |dows-lin|ewise #[|
|00003de0| 28 64 75 6d 62 2d 6d 6f | 64 65 20 26 6f 70 74 69 |(dumb-mo|de &opti|
|00003df0| 6f 6e 61 6c 20 77 69 6e | 64 2d 41 20 77 69 6e 64 |onal win|d-A wind|
|00003e00| 2d 42 20 73 74 61 72 74 | 75 70 2d 68 6f 6f 6b 73 |-B start|up-hooks|
|00003e10| 29 20 22 c0 09 5c 6e 0b | 0c c5 c6 26 06 87 22 20 |) "..\n.|...&.." |
|00003e20| 5b 65 64 69 66 66 2d 77 | 69 6e 64 6f 77 73 20 64 |[ediff-w|indows d|
|00003e30| 75 6d 62 2d 6d 6f 64 65 | 20 77 69 6e 64 2d 41 20 |umb-mode| wind-A |
|00003e40| 77 69 6e 64 2d 42 20 73 | 74 61 72 74 75 70 2d 68 |wind-B s|tartup-h|
|00003e50| 6f 6f 6b 73 20 65 64 69 | 66 66 2d 77 69 6e 64 6f |ooks edi|ff-windo|
|00003e60| 77 73 2d 6c 69 6e 65 77 | 69 73 65 20 6e 69 6c 5d |ws-linew|ise nil]|
|00003e70| 20 37 20 28 23 24 20 2e | 20 31 35 35 36 38 29 20 | 7 (#$ .| 15568) |
|00003e80| 22 50 22 5d 29 0a 28 64 | 65 66 61 6c 69 61 73 20 |"P"]).(d|efalias |
|00003e90| 27 65 64 69 66 66 2d 77 | 69 6e 64 6f 77 73 20 23 |'ediff-w|indows #|
|00003ea0| 5b 28 64 75 6d 62 2d 6d | 6f 64 65 20 77 69 6e 64 |[(dumb-m|ode wind|
|00003eb0| 2d 41 20 77 69 6e 64 2d | 42 20 73 74 61 72 74 75 |-A wind-|B startu|
|00003ec0| 70 2d 68 6f 6f 6b 73 20 | 6a 6f 62 2d 6e 61 6d 65 |p-hooks |job-name|
|00003ed0| 20 77 6f 72 64 2d 6d 6f | 64 65 29 20 22 08 ac 84 | word-mo|de) "...|
|00003ee0| c1 20 ac b2 5c 6e c3 1c | 1d c6 0d 21 ae 8c 0c ab |. ..\n..|...!....|
|00003ef0| 85 c7 0d 21 aa 82 c8 20 | 89 15 2a 12 0e 09 5c 6e |...!... |..*...\n|
|00003f00| 1c 1d c6 0d 21 ae 8c 0c | ab 85 c7 0d 21 aa 82 c8 |....!...|....!...|
|00003f10| 20 89 15 2a 16 09 aa 8e | ca 5c 6e c3 cb 23 12 ca | ..*....|.\n..#..|
|00003f20| 0e 09 5c 6e cc 23 16 09 | cd 5c 6e 21 cd 0e 09 21 |..\n.#..|.\n!...!|
|00003f30| c3 89 89 89 1e 0e 1e 0f | 1e 10 1e 11 1e 12 1e 13 |........|........|
|00003f40| 8a d4 8b 88 29 d5 0e 13 | 0e 11 0e 10 0e 12 0e 0f |....)...|........|
|00003f50| 0e 0e 0e 16 0e 17 0e 18 | c3 26 5c 6e 2e 06 87 22 |........|.&\n..."|
|00003f60| 20 5b 64 75 6d 62 2d 6d | 6f 64 65 20 65 64 69 66 | [dumb-m|ode edif|
|00003f70| 66 2d 77 69 6e 64 6f 77 | 2d 64 69 73 70 6c 61 79 |f-window|-display|
|00003f80| 2d 70 20 77 69 6e 64 2d | 41 20 6e 69 6c 20 70 72 |-p wind-|A nil pr|
|00003f90| 65 76 2d 77 69 6e 64 20 | 77 69 6e 64 20 77 69 6e |ev-wind |wind win|
|00003fa0| 64 6f 77 2d 6c 69 76 65 | 2d 70 20 6e 65 78 74 2d |dow-live|-p next-|
|00003fb0| 77 69 6e 64 6f 77 20 73 | 65 6c 65 63 74 65 64 2d |window s|elected-|
|00003fc0| 77 69 6e 64 6f 77 20 77 | 69 6e 64 2d 42 20 65 64 |window w|ind-B ed|
|00003fd0| 69 66 66 2d 67 65 74 2d | 77 69 6e 64 6f 77 2d 62 |iff-get-|window-b|
|00003fe0| 79 2d 63 6c 69 63 6b 69 | 6e 67 20 31 20 32 20 77 |y-clicki|ng 1 2 w|
|00003ff0| 69 6e 64 6f 77 2d 62 75 | 66 66 65 72 20 65 6e 64 |indow-bu|ffer end|
|00004000| 2d 42 20 62 65 67 2d 42 | 20 65 6e 64 2d 41 20 62 |-B beg-B| end-A b|
|00004010| 65 67 2d 41 20 62 75 66 | 66 65 72 2d 42 20 62 75 |eg-A buf|fer-B bu|
|00004020| 66 66 65 72 2d 41 20 28 | 28 62 79 74 65 2d 63 6f |ffer-A (|(byte-co|
|00004030| 64 65 20 22 c0 c1 21 88 | c2 0b 21 88 c4 20 15 c6 |de "..!.|..!.. ..|
|00004040| 20 16 07 c2 0e 08 21 88 | c4 20 16 09 c6 20 16 5c | .....!.|. ... .\|
|00004050| 6e c0 87 22 20 5b 73 69 | 74 2d 66 6f 72 20 30 20 |n.." [si|t-for 0 |
|00004060| 73 65 6c 65 63 74 2d 77 | 69 6e 64 6f 77 20 77 69 |select-w|indow wi|
|00004070| 6e 64 2d 41 20 77 69 6e | 64 6f 77 2d 73 74 61 72 |nd-A win|dow-star|
|00004080| 74 20 62 65 67 2d 41 20 | 77 69 6e 64 6f 77 2d 65 |t beg-A |window-e|
|00004090| 6e 64 20 65 6e 64 2d 41 | 20 77 69 6e 64 2d 42 20 |nd end-A| wind-B |
|000040a0| 62 65 67 2d 42 20 65 6e | 64 2d 42 5d 20 32 29 29 |beg-B en|d-B] 2))|
|000040b0| 20 65 64 69 66 66 2d 72 | 65 67 69 6f 6e 73 2d 69 | ediff-r|egions-i|
|000040c0| 6e 74 65 72 6e 61 6c 20 | 73 74 61 72 74 75 70 2d |nternal |startup-|
|000040d0| 68 6f 6f 6b 73 20 6a 6f | 62 2d 6e 61 6d 65 20 77 |hooks jo|b-name w|
|000040e0| 6f 72 64 2d 6d 6f 64 65 | 5d 20 31 31 5d 29 0a 23 |ord-mode|] 11]).#|
|000040f0| 40 32 35 31 20 52 75 6e | 20 45 64 69 66 66 20 6f |@251 Run| Ediff o|
|00004100| 6e 20 61 20 70 61 69 72 | 20 6f 66 20 72 65 67 69 |n a pair| of regi|
|00004110| 6f 6e 73 20 69 6e 20 74 | 77 6f 20 64 69 66 66 65 |ons in t|wo diffe|
|00004120| 72 65 6e 74 20 62 75 66 | 66 65 72 73 2e 0a 52 65 |rent buf|fers..Re|
|00004130| 67 69 6f 6e 73 20 28 69 | 2e 65 2e 2c 20 70 6f 69 |gions (i|.e., poi|
|00004140| 6e 74 20 61 6e 64 20 6d | 61 72 6b 29 20 61 72 65 |nt and m|ark) are|
|00004150| 20 61 73 73 75 6d 65 64 | 20 74 6f 20 62 65 20 73 | assumed| to be s|
|00004160| 65 74 20 69 6e 20 61 64 | 76 61 6e 63 65 2e 0a 54 |et in ad|vance..T|
|00004170| 68 69 73 20 66 75 6e 63 | 74 69 6f 6e 20 69 73 20 |his func|tion is |
|00004180| 65 66 66 65 63 74 69 76 | 65 20 6f 6e 6c 79 20 66 |effectiv|e only f|
|00004190| 6f 72 20 72 65 6c 61 74 | 69 76 65 6c 79 20 73 6d |or relat|ively sm|
|000041a0| 61 6c 6c 20 72 65 67 69 | 6f 6e 73 2c 20 75 70 20 |all regi|ons, up |
|000041b0| 74 6f 20 32 30 30 0a 6c | 69 6e 65 73 2e 20 46 6f |to 200.l|ines. Fo|
|000041c0| 72 20 6c 61 72 67 65 20 | 72 65 67 69 6f 6e 73 2c |r large |regions,|
|000041d0| 20 75 73 65 20 60 65 64 | 69 66 66 2d 72 65 67 69 | use `ed|iff-regi|
|000041e0| 6f 6e 73 2d 6c 69 6e 65 | 77 69 73 65 27 2e 1f 0a |ons-line|wise'...|
|000041f0| 28 64 65 66 61 6c 69 61 | 73 20 27 65 64 69 66 66 |(defalia|s 'ediff|
|00004200| 2d 72 65 67 69 6f 6e 73 | 2d 77 6f 72 64 77 69 73 |-regions|-wordwis|
|00004210| 65 20 23 5b 28 62 75 66 | 66 65 72 2d 41 20 62 75 |e #[(buf|fer-A bu|
|00004220| 66 66 65 72 2d 42 20 26 | 6f 70 74 69 6f 6e 61 6c |ffer-B &|optional|
|00004230| 20 73 74 61 72 74 75 70 | 2d 68 6f 6f 6b 73 29 20 | startup|-hooks) |
|00004240| 22 08 ab 8c c1 08 21 ab | 87 c2 c1 08 21 21 ac 85 |".....!.|....!!..|
|00004250| c3 c4 08 5c 22 88 0d ab | 8c c1 0d 21 ab 87 c2 c1 |...\"...|...!....|
|00004260| 0d 21 21 ac 85 c3 c4 0d | 5c 22 88 c6 89 89 89 1e |.!!.....|\"......|
|00004270| 07 1e 08 1e 09 1e 5c 6e | 8a 08 71 88 cb 20 16 5c |......\n|..q.. .\|
|00004280| 6e cc 20 16 09 0d 71 88 | cb 20 16 08 cc 20 16 07 |n. ...q.|. ... ..|
|00004290| 29 cd c1 08 21 0e 5c 6e | 0e 09 c1 0d 21 0e 08 0e |)...!.\n|....!...|
|000042a0| 07 0e 0e cf d0 c6 26 5c | 6e 2c 87 22 20 5b 62 75 |......&\|n,." [bu|
|000042b0| 66 66 65 72 2d 41 20 67 | 65 74 2d 62 75 66 66 65 |ffer-A g|et-buffe|
|000042c0| 72 20 62 75 66 66 65 72 | 2d 6e 61 6d 65 20 65 72 |r buffer|-name er|
|000042d0| 72 6f 72 20 22 42 75 66 | 66 65 72 20 25 53 20 64 |ror "Buf|fer %S d|
|000042e0| 6f 65 73 6e 27 74 20 65 | 78 69 73 74 22 20 62 75 |oesn't e|xist" bu|
|000042f0| 66 66 65 72 2d 42 20 6e | 69 6c 20 72 65 67 2d 42 |ffer-B n|il reg-B|
|00004300| 2d 65 6e 64 20 72 65 67 | 2d 42 2d 62 65 67 20 72 |-end reg|-B-beg r|
|00004310| 65 67 2d 41 2d 65 6e 64 | 20 72 65 67 2d 41 2d 62 |eg-A-end| reg-A-b|
|00004320| 65 67 20 72 65 67 69 6f | 6e 2d 62 65 67 69 6e 6e |eg regio|n-beginn|
|00004330| 69 6e 67 20 72 65 67 69 | 6f 6e 2d 65 6e 64 20 65 |ing regi|on-end e|
|00004340| 64 69 66 66 2d 72 65 67 | 69 6f 6e 73 2d 69 6e 74 |diff-reg|ions-int|
|00004350| 65 72 6e 61 6c 20 73 74 | 61 72 74 75 70 2d 68 6f |ernal st|artup-ho|
|00004360| 6f 6b 73 20 65 64 69 66 | 66 2d 72 65 67 69 6f 6e |oks edif|f-region|
|00004370| 73 2d 77 6f 72 64 77 69 | 73 65 20 77 6f 72 64 2d |s-wordwi|se word-|
|00004380| 6d 6f 64 65 5d 20 31 31 | 20 28 23 24 20 2e 20 31 |mode] 11| (#$ . 1|
|00004390| 36 36 32 39 29 20 28 6c | 65 74 20 28 62 66 29 20 |6629) (l|et (bf) |
|000043a0| 28 6c 69 73 74 20 28 73 | 65 74 71 20 62 66 20 28 |(list (s|etq bf (|
|000043b0| 72 65 61 64 2d 62 75 66 | 66 65 72 20 22 52 65 67 |read-buf|fer "Reg|
|000043c0| 69 6f 6e 27 73 20 41 20 | 62 75 66 66 65 72 3a 20 |ion's A |buffer: |
|000043d0| 22 20 28 65 64 69 66 66 | 2d 6f 74 68 65 72 2d 62 |" (ediff|-other-b|
|000043e0| 75 66 66 65 72 20 22 22 | 29 20 74 29 29 20 28 72 |uffer ""|) t)) (r|
|000043f0| 65 61 64 2d 62 75 66 66 | 65 72 20 22 52 65 67 69 |ead-buff|er "Regi|
|00004400| 6f 6e 27 73 20 42 20 62 | 75 66 66 65 72 3a 20 22 |on's B b|uffer: "|
|00004410| 20 28 70 72 6f 67 6e 20 | 28 73 61 76 65 2d 77 69 | (progn |(save-wi|
|00004420| 6e 64 6f 77 2d 65 78 63 | 75 72 73 69 6f 6e 20 28 |ndow-exc|ursion (|
|00004430| 6f 74 68 65 72 2d 77 69 | 6e 64 6f 77 20 31 29 29 |other-wi|ndow 1))|
|00004440| 20 28 65 64 69 66 66 2d | 6f 74 68 65 72 2d 62 75 | (ediff-|other-bu|
|00004450| 66 66 65 72 20 62 66 29 | 29 20 74 29 29 29 5d 29 |ffer bf)|) t)))])|
|00004460| 0a 23 40 32 38 35 20 52 | 75 6e 20 45 64 69 66 66 |.#@285 R|un Ediff|
|00004470| 20 6f 6e 20 61 20 70 61 | 69 72 20 6f 66 20 72 65 | on a pa|ir of re|
|00004480| 67 69 6f 6e 73 20 69 6e | 20 74 77 6f 20 64 69 66 |gions in| two dif|
|00004490| 66 65 72 65 6e 74 20 62 | 75 66 66 65 72 73 2e 0a |ferent b|uffers..|
|000044a0| 52 65 67 69 6f 6e 73 20 | 28 69 2e 65 2e 2c 20 70 |Regions |(i.e., p|
|000044b0| 6f 69 6e 74 20 61 6e 64 | 20 6d 61 72 6b 29 20 61 |oint and| mark) a|
|000044c0| 72 65 20 61 73 73 75 6d | 65 64 20 74 6f 20 62 65 |re assum|ed to be|
|000044d0| 20 73 65 74 20 69 6e 20 | 61 64 76 61 6e 63 65 2e | set in |advance.|
|000044e0| 0a 45 61 63 68 20 72 65 | 67 69 6f 6e 20 69 73 20 |.Each re|gion is |
|000044f0| 65 6e 6c 61 72 67 65 64 | 20 74 6f 20 63 6f 6e 74 |enlarged| to cont|
|00004500| 61 69 6e 20 66 75 6c 6c | 20 6c 69 6e 65 73 2e 0a |ain full| lines..|
|00004510| 54 68 69 73 20 66 75 6e | 63 74 69 6f 6e 20 69 73 |This fun|ction is|
|00004520| 20 65 66 66 65 63 74 69 | 76 65 20 66 6f 72 20 6c | effecti|ve for l|
|00004530| 61 72 67 65 20 72 65 67 | 69 6f 6e 73 2c 20 6f 76 |arge reg|ions, ov|
|00004540| 65 72 20 31 30 30 2d 32 | 30 30 0a 6c 69 6e 65 73 |er 100-2|00.lines|
|00004550| 2e 20 46 6f 72 20 73 6d | 61 6c 6c 20 72 65 67 69 |. For sm|all regi|
|00004560| 6f 6e 73 2c 20 75 73 65 | 20 60 65 64 69 66 66 2d |ons, use| `ediff-|
|00004570| 72 65 67 69 6f 6e 73 2d | 77 6f 72 64 77 69 73 65 |regions-|wordwise|
|00004580| 27 2e 1f 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 |'...(def|alias 'e|
|00004590| 64 69 66 66 2d 72 65 67 | 69 6f 6e 73 2d 6c 69 6e |diff-reg|ions-lin|
|000045a0| 65 77 69 73 65 20 23 5b | 28 62 75 66 66 65 72 2d |ewise #[|(buffer-|
|000045b0| 41 20 62 75 66 66 65 72 | 2d 42 20 26 6f 70 74 69 |A buffer|-B &opti|
|000045c0| 6f 6e 61 6c 20 73 74 61 | 72 74 75 70 2d 68 6f 6f |onal sta|rtup-hoo|
|000045d0| 6b 73 29 20 22 08 ab 8c | c1 08 21 ab 87 c2 c1 08 |ks) "...|..!.....|
|000045e0| 21 21 ac 85 c3 c4 08 5c | 22 88 0d ab 8c c1 0d 21 |!!.....\|"......!|
|000045f0| ab 87 c2 c1 0d 21 21 ac | 85 c3 c4 0d 5c 22 88 c6 |.....!!.|....\"..|
|00004600| 89 89 89 1e 07 1e 08 1e | 09 1e 5c 6e 8a 08 71 88 |........|..\n..q.|
|00004610| cb 20 16 5c 6e cc 20 16 | 09 0e 5c 6e 62 88 cd 79 |. .\n. .|..\nb..y|
|00004620| 88 60 16 5c 6e 0e 09 62 | 88 c6 7f 88 6d ac 83 c6 |.`.\n..b|....m...|
|00004630| 75 88 60 16 09 0d 71 88 | cb 20 16 08 cc 20 16 07 |u.`...q.|. ... ..|
|00004640| 0e 08 62 88 cd 79 88 60 | 16 08 0e 07 62 88 c6 7f |..b..y.`|....b...|
|00004650| 88 6d ac 83 c6 75 88 60 | 16 07 29 ce c1 08 21 0e |.m...u.`|..)...!.|
|00004660| 5c 6e 0e 09 c1 0d 21 0e | 08 0e 07 0e 0f d0 c6 89 |\n....!.|........|
|00004670| 26 5c 6e 2c 87 22 20 5b | 62 75 66 66 65 72 2d 41 |&\n,." [|buffer-A|
|00004680| 20 67 65 74 2d 62 75 66 | 66 65 72 20 62 75 66 66 | get-buf|fer buff|
|00004690| 65 72 2d 6e 61 6d 65 20 | 65 72 72 6f 72 20 22 42 |er-name |error "B|
|000046a0| 75 66 66 65 72 20 25 53 | 20 64 6f 65 73 6e 27 74 |uffer %S| doesn't|
|000046b0| 20 65 78 69 73 74 22 20 | 62 75 66 66 65 72 2d 42 | exist" |buffer-B|
|000046c0| 20 6e 69 6c 20 72 65 67 | 2d 42 2d 65 6e 64 20 72 | nil reg|-B-end r|
|000046d0| 65 67 2d 42 2d 62 65 67 | 20 72 65 67 2d 41 2d 65 |eg-B-beg| reg-A-e|
|000046e0| 6e 64 20 72 65 67 2d 41 | 2d 62 65 67 20 72 65 67 |nd reg-A|-beg reg|
|000046f0| 69 6f 6e 2d 62 65 67 69 | 6e 6e 69 6e 67 20 72 65 |ion-begi|nning re|
|00004700| 67 69 6f 6e 2d 65 6e 64 | 20 30 20 65 64 69 66 66 |gion-end| 0 ediff|
|00004710| 2d 72 65 67 69 6f 6e 73 | 2d 69 6e 74 65 72 6e 61 |-regions|-interna|
|00004720| 6c 20 73 74 61 72 74 75 | 70 2d 68 6f 6f 6b 73 20 |l startu|p-hooks |
|00004730| 65 64 69 66 66 2d 72 65 | 67 69 6f 6e 73 2d 6c 69 |ediff-re|gions-li|
|00004740| 6e 65 77 69 73 65 5d 20 | 31 31 20 28 23 24 20 2e |newise] |11 (#$ .|
|00004750| 20 31 37 35 31 31 29 20 | 28 6c 65 74 20 28 62 66 | 17511) |(let (bf|
|00004760| 29 20 28 6c 69 73 74 20 | 28 73 65 74 71 20 62 66 |) (list |(setq bf|
|00004770| 20 28 72 65 61 64 2d 62 | 75 66 66 65 72 20 22 52 | (read-b|uffer "R|
|00004780| 65 67 69 6f 6e 20 41 27 | 73 20 62 75 66 66 65 72 |egion A'|s buffer|
|00004790| 3a 20 22 20 28 65 64 69 | 66 66 2d 6f 74 68 65 72 |: " (edi|ff-other|
|000047a0| 2d 62 75 66 66 65 72 20 | 22 22 29 20 74 29 29 20 |-buffer |"") t)) |
|000047b0| 28 72 65 61 64 2d 62 75 | 66 66 65 72 20 22 52 65 |(read-bu|ffer "Re|
|000047c0| 67 69 6f 6e 20 42 27 73 | 20 62 75 66 66 65 72 3a |gion B's| buffer:|
|000047d0| 20 22 20 28 70 72 6f 67 | 6e 20 28 73 61 76 65 2d | " (prog|n (save-|
|000047e0| 77 69 6e 64 6f 77 2d 65 | 78 63 75 72 73 69 6f 6e |window-e|xcursion|
|000047f0| 20 28 6f 74 68 65 72 2d | 77 69 6e 64 6f 77 20 31 | (other-|window 1|
|00004800| 29 29 20 28 65 64 69 66 | 66 2d 6f 74 68 65 72 2d |)) (edif|f-other-|
|00004810| 62 75 66 66 65 72 20 62 | 66 29 29 20 74 29 29 29 |buffer b|f)) t)))|
|00004820| 5d 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |]).(defa|lias 'ed|
|00004830| 69 66 66 2d 72 65 67 69 | 6f 6e 73 2d 69 6e 74 65 |iff-regi|ons-inte|
|00004840| 72 6e 61 6c 20 23 5b 28 | 62 75 66 66 65 72 2d 41 |rnal #[(|buffer-A|
|00004850| 20 62 65 67 2d 41 20 65 | 6e 64 2d 41 20 62 75 66 | beg-A e|nd-A buf|
|00004860| 66 65 72 2d 42 20 62 65 | 67 2d 42 20 65 6e 64 2d |fer-B be|g-B end-|
|00004870| 42 20 73 74 61 72 74 75 | 70 2d 68 6f 6f 6b 73 20 |B startu|p-hooks |
|00004880| 6a 6f 62 2d 6e 61 6d 65 | 20 77 6f 72 64 2d 6d 6f |job-name| word-mo|
|00004890| 64 65 20 73 65 74 75 70 | 2d 70 61 72 61 6d 65 74 |de setup|-paramet|
|000048a0| 65 72 73 29 20 22 c0 09 | 21 c2 89 89 89 1b 1c 1d |ers) "..|!.......|
|000048b0| 1e 06 1e 07 0e 08 ab a6 | c9 0e 08 21 ab a0 ca c9 |........|...!....|
|000048c0| 0e 08 21 21 ab 98 72 0e | 08 71 88 cb 20 0e 0c c2 |..!!..r.|.q.. ...|
|000048d0| 93 16 0c cb 20 0e 0d c2 | 93 16 0d 29 aa 8b 0e 0e |.... ...|...)....|
|000048e0| cf 61 ac 85 d0 0e 11 21 | 88 0e 12 ab a6 c9 0e 12 |.a.....!|........|
|000048f0| 21 ab a0 ca c9 0e 12 21 | 21 ab 98 72 0e 12 71 88 |!......!|!..r..q.|
|00004900| cb 20 0e 13 c2 93 16 13 | cb 20 0e 14 c2 93 16 14 |. ......|. ......|
|00004910| 29 aa 8b 0e 0e cf 61 ac | 85 d0 0e 11 21 88 0e 08 |).....a.|....!...|
|00004920| 0e 12 61 ab af 0e 0c 0e | 14 57 ab 87 0e 13 0e 0c |..a.....|.W......|
|00004930| 58 ac 8e 0e 13 0e 0d 57 | ab 9a 0e 0d 0e 14 58 ab |X......W|......X.|
|00004940| 93 0e 15 90 d6 d7 21 91 | 88 d8 d9 21 ac 86 d0 da |......!.|...!....|
|00004950| 0e 1b 5c 22 88 0e 1c ab | 8d dd 0e 0c 0e 0d 0e 08 |..\"....|........|
|00004960| 0e 07 24 88 aa 8b de 0e | 0c 0e 0d 0e 08 0e 07 24 |..$.....|.......$|
|00004970| 88 df 0e 07 e0 5c 22 14 | 0e 1c ab 8d dd 0e 13 0e |.....\".|........|
|00004980| 14 0e 12 0e 07 24 88 aa | 8b de 0e 13 0e 14 0e 12 |.....$..|........|
|00004990| 0e 07 24 88 df 0e 07 e1 | 5c 22 13 e2 0e 0c 0e 0d |..$.....|\"......|
|000049a0| 0e 08 23 16 06 e2 0e 13 | 0e 14 0e 12 23 15 e3 0e |..#.....|....#...|
|000049b0| 08 0c 0e 12 0b c2 89 e4 | c2 e5 0c 44 e5 0b 44 46 |........|...D..DF|
|000049c0| 0e 26 42 e7 e8 0e 1c 42 | e9 0e 06 0d 44 42 ea 0e |.&B....B|....DB..|
|000049d0| 1b 42 45 0e 2b 5c 22 26 | 08 2d 87 22 20 5b 67 65 |.BE.+\"&|.-." [ge|
|000049e0| 74 2d 62 75 66 66 65 72 | 2d 63 72 65 61 74 65 20 |t-buffer|-create |
|000049f0| 65 64 69 66 66 2d 74 6d | 70 2d 62 75 66 66 65 72 |ediff-tm|p-buffer|
|00004a00| 20 6e 69 6c 20 66 69 6c | 65 2d 42 20 66 69 6c 65 | nil fil|e-B file|
|00004a10| 2d 41 20 6f 76 65 72 6c | 2d 42 20 6f 76 65 72 6c |-A overl|-B overl|
|00004a20| 2d 41 20 74 6d 70 2d 62 | 75 66 66 65 72 20 62 75 |-A tmp-b|uffer bu|
|00004a30| 66 66 65 72 2d 41 20 67 | 65 74 2d 62 75 66 66 65 |ffer-A g|et-buffe|
|00004a40| 72 20 62 75 66 66 65 72 | 2d 6e 61 6d 65 20 6d 61 |r buffer|-name ma|
|00004a50| 6b 65 2d 6d 61 72 6b 65 | 72 20 62 65 67 2d 41 20 |ke-marke|r beg-A |
|00004a60| 65 6e 64 2d 41 20 74 68 | 69 73 2d 63 6f 6d 6d 61 |end-A th|is-comma|
|00004a70| 6e 64 20 65 64 69 66 66 | 2d 71 75 69 74 20 65 72 |nd ediff|-quit er|
|00004a80| 72 6f 72 20 65 64 69 66 | 66 2d 4b 49 4c 4c 45 44 |ror edif|f-KILLED|
|00004a90| 2d 56 49 54 41 4c 2d 42 | 55 46 46 45 52 20 62 75 |-VITAL-B|UFFER bu|
|00004aa0| 66 66 65 72 2d 42 20 62 | 65 67 2d 42 20 65 6e 64 |ffer-B b|eg-B end|
|00004ab0| 2d 42 20 65 64 69 66 66 | 2d 6d 73 67 2d 62 75 66 |-B ediff|-msg-buf|
|00004ac0| 66 65 72 20 70 72 69 6e | 63 20 22 5c 6e 59 6f 75 |fer prin|c "\nYou|
|00004ad0| 20 68 61 76 65 20 72 65 | 71 75 65 73 74 65 64 20 | have re|quested |
|00004ae0| 74 6f 20 63 6f 6d 70 61 | 72 65 20 6f 76 65 72 6c |to compa|re overl|
|00004af0| 61 70 70 69 6e 67 20 72 | 65 67 69 6f 6e 73 20 6f |apping r|egions o|
|00004b00| 66 20 74 68 65 20 73 61 | 6d 65 20 62 75 66 66 65 |f the sa|me buffe|
|00004b10| 72 2e 5c 6e 5c 6e 49 6e | 20 74 68 69 73 20 63 61 |r.\n\nIn| this ca|
|00004b20| 73 65 2c 20 45 64 69 66 | 66 27 73 20 68 69 67 68 |se, Edif|f's high|
|00004b30| 6c 69 67 68 74 69 6e 67 | 20 6d 61 79 20 62 65 20 |lighting| may be |
|00004b40| 63 6f 6e 66 75 73 69 6e | 67 2d 2d 2d 69 6e 20 74 |confusin|g---in t|
|00004b50| 68 65 20 73 61 6d 65 20 | 77 69 6e 64 6f 77 2c 5c |he same |window,\|
|00004b60| 6e 79 6f 75 20 6d 61 79 | 20 73 65 65 20 68 69 67 |nyou may| see hig|
|00004b70| 68 6c 69 67 68 74 65 64 | 20 72 65 67 69 6f 6e 73 |hlighted| regions|
|00004b80| 20 74 68 61 74 20 62 65 | 6c 6f 6e 67 20 74 6f 20 | that be|long to |
|00004b90| 64 69 66 66 65 72 65 6e | 74 20 72 65 67 69 6f 6e |differen|t region|
|00004ba0| 73 2e 5c 6e 5c 6e 43 6f | 6e 74 69 6e 75 65 20 61 |s.\n\nCo|ntinue a|
|00004bb0| 6e 79 77 61 79 3f 20 28 | 79 2f 6e 29 20 22 20 79 |nyway? (|y/n) " y|
|00004bc0| 2d 6f 72 2d 6e 2d 70 20 | 22 43 6f 6e 74 69 6e 75 |-or-n-p |"Continu|
|00004bd0| 65 20 61 6e 79 77 61 79 | 3f 20 22 20 22 25 53 20 |e anyway|? " "%S |
|00004be0| 61 62 6f 72 74 65 64 22 | 20 6a 6f 62 2d 6e 61 6d |aborted"| job-nam|
|00004bf0| 65 20 77 6f 72 64 2d 6d | 6f 64 65 20 65 64 69 66 |e word-m|ode edif|
|00004c00| 66 2d 77 6f 72 64 69 66 | 79 20 65 64 69 66 66 2d |f-wordif|y ediff-|
|00004c10| 63 6f 70 79 2d 74 6f 2d | 62 75 66 66 65 72 20 65 |copy-to-|buffer e|
|00004c20| 64 69 66 66 2d 6d 61 6b | 65 2d 74 65 6d 70 2d 66 |diff-mak|e-temp-f|
|00004c30| 69 6c 65 20 22 72 65 67 | 41 22 20 22 72 65 67 42 |ile "reg|A" "regB|
|00004c40| 22 20 65 64 69 66 66 2d | 6d 61 6b 65 2d 62 75 6c |" ediff-|make-bul|
|00004c50| 6c 65 74 2d 70 72 6f 6f | 66 2d 6f 76 65 72 6c 61 |let-proo|f-overla|
|00004c60| 79 20 65 64 69 66 66 2d | 73 65 74 75 70 20 6c 61 |y ediff-|setup la|
|00004c70| 6d 62 64 61 20 64 65 6c | 65 74 65 2d 66 69 6c 65 |mbda del|ete-file|
|00004c80| 20 73 74 61 72 74 75 70 | 2d 68 6f 6f 6b 73 20 61 | startup|-hooks a|
|00004c90| 70 70 65 6e 64 20 65 64 | 69 66 66 2d 77 6f 72 64 |ppend ed|iff-word|
|00004ca0| 2d 6d 6f 64 65 20 65 64 | 69 66 66 2d 6e 61 72 72 |-mode ed|iff-narr|
|00004cb0| 6f 77 2d 62 6f 75 6e 64 | 73 20 65 64 69 66 66 2d |ow-bound|s ediff-|
|00004cc0| 6a 6f 62 2d 6e 61 6d 65 | 20 73 65 74 75 70 2d 70 |job-name| setup-p|
|00004cd0| 61 72 61 6d 65 74 65 72 | 73 5d 20 31 33 5d 29 0a |arameter|s] 13]).|
|00004ce0| 28 64 65 66 61 6c 69 61 | 73 20 27 65 64 69 66 66 |(defalia|s 'ediff|
|00004cf0| 2d 6d 65 72 67 65 20 27 | 65 64 69 66 66 2d 6d 65 |-merge '|ediff-me|
|00004d00| 72 67 65 2d 66 69 6c 65 | 73 29 0a 28 64 65 66 61 |rge-file|s).(defa|
|00004d10| 6c 69 61 73 20 27 65 64 | 69 66 66 2d 6d 65 72 67 |lias 'ed|iff-merg|
|00004d20| 65 2d 6f 6e 2d 73 74 61 | 72 74 75 70 20 23 5b 6e |e-on-sta|rtup #[n|
|00004d30| 69 6c 20 22 c0 c1 21 88 | 5c 6e ab 95 c3 5c 6e 21 |il "..!.|\n...\n!|
|00004d40| ab 90 c4 c3 5c 6e 21 21 | ab 89 72 5c 6e 71 88 c5 |....\n!!|..r\nq..|
|00004d50| c6 21 29 87 0e 07 c8 61 | ae 84 c9 0e 5c 6e 21 87 |.!)....a|....\n!.|
|00004d60| 22 20 5b 65 64 69 66 66 | 2d 64 6f 2d 6d 65 72 67 |" [ediff|-do-merg|
|00004d70| 65 20 30 20 65 64 69 66 | 66 2d 62 75 66 66 65 72 |e 0 edif|f-buffer|
|00004d80| 2d 43 20 67 65 74 2d 62 | 75 66 66 65 72 20 62 75 |-C get-b|uffer bu|
|00004d90| 66 66 65 72 2d 6e 61 6d | 65 20 73 65 74 2d 62 75 |ffer-nam|e set-bu|
|00004da0| 66 66 65 72 2d 6d 6f 64 | 69 66 69 65 64 2d 70 20 |ffer-mod|ified-p |
|00004db0| 6e 69 6c 20 74 68 69 73 | 2d 63 6f 6d 6d 61 6e 64 |nil this|-command|
|00004dc0| 20 65 64 69 66 66 2d 71 | 75 69 74 20 65 72 72 6f | ediff-q|uit erro|
|00004dd0| 72 20 65 64 69 66 66 2d | 4b 49 4c 4c 45 44 2d 56 |r ediff-|KILLED-V|
|00004de0| 49 54 41 4c 2d 42 55 46 | 46 45 52 5d 20 33 5d 29 |ITAL-BUF|FER] 3])|
|00004df0| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 4e |.(byte-c|ode "..N|
|00004e00| c2 73 ac 85 c3 c4 c0 5c | 22 88 c5 c0 c1 c6 23 87 |.s.....\|".....#.|
|00004e10| 22 20 5b 65 64 69 66 66 | 2d 6d 65 72 67 65 2d 6f |" [ediff|-merge-o|
|00004e20| 6e 2d 73 74 61 72 74 75 | 70 20 62 79 74 65 2d 6f |n-startu|p byte-o|
|00004e30| 70 74 69 6d 69 7a 65 72 | 20 28 6e 69 6c 20 62 79 |ptimizer| (nil by|
|00004e40| 74 65 2d 63 6f 6d 70 69 | 6c 65 2d 69 6e 6c 69 6e |te-compi|le-inlin|
|00004e50| 65 2d 65 78 70 61 6e 64 | 29 20 65 72 72 6f 72 20 |e-expand|) error |
|00004e60| 22 25 73 20 61 6c 72 65 | 61 64 79 20 68 61 73 20 |"%s alre|ady has |
|00004e70| 61 20 62 79 74 65 2d 6f | 70 74 69 6d 69 7a 65 72 |a byte-o|ptimizer|
|00004e80| 2c 20 63 61 6e 27 74 20 | 6d 61 6b 65 20 69 74 20 |, can't |make it |
|00004e90| 69 6e 6c 69 6e 65 22 20 | 70 75 74 20 62 79 74 65 |inline" |put byte|
|00004ea0| 2d 63 6f 6d 70 69 6c 65 | 2d 69 6e 6c 69 6e 65 2d |-compile|-inline-|
|00004eb0| 65 78 70 61 6e 64 5d 20 | 34 29 0a 23 40 33 35 20 |expand] |4).#@35 |
|00004ec0| 4d 65 72 67 65 20 74 77 | 6f 20 66 69 6c 65 73 20 |Merge tw|o files |
|00004ed0| 77 69 74 68 6f 75 74 20 | 61 6e 63 65 73 74 6f 72 |without |ancestor|
|00004ee0| 2e 1f 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |...(defa|lias 'ed|
|00004ef0| 69 66 66 2d 6d 65 72 67 | 65 2d 66 69 6c 65 73 20 |iff-merg|e-files |
|00004f00| 23 5b 28 66 69 6c 65 2d | 41 20 66 69 6c 65 2d 42 |#[(file-|A file-B|
|00004f10| 20 26 6f 70 74 69 6f 6e | 61 6c 20 73 74 61 72 74 | &option|al start|
|00004f20| 75 70 2d 68 6f 6f 6b 73 | 20 6d 65 72 67 65 2d 62 |up-hooks| merge-b|
|00004f30| 75 66 66 65 72 2d 66 69 | 6c 65 29 20 22 c0 09 42 |uffer-fi|le) "..B|
|00004f40| 11 c2 0b c4 0d 21 ab 88 | c6 c7 0b 21 0d 5c 22 aa |.....!..|...!.\".|
|00004f50| 81 0d c8 09 c9 0e 5c 6e | 26 06 87 22 20 5b 65 64 |......\n|&.." [ed|
|00004f60| 69 66 66 2d 6d 65 72 67 | 65 2d 6f 6e 2d 73 74 61 |iff-merg|e-on-sta|
|00004f70| 72 74 75 70 20 73 74 61 | 72 74 75 70 2d 68 6f 6f |rtup sta|rtup-hoo|
|00004f80| 6b 73 20 65 64 69 66 66 | 2d 66 69 6c 65 73 2d 69 |ks ediff|-files-i|
|00004f90| 6e 74 65 72 6e 61 6c 20 | 66 69 6c 65 2d 41 20 66 |nternal |file-A f|
|00004fa0| 69 6c 65 2d 64 69 72 65 | 63 74 6f 72 79 2d 70 20 |ile-dire|ctory-p |
|00004fb0| 66 69 6c 65 2d 42 20 65 | 78 70 61 6e 64 2d 66 69 |file-B e|xpand-fi|
|00004fc0| 6c 65 2d 6e 61 6d 65 20 | 66 69 6c 65 2d 6e 61 6d |le-name |file-nam|
|00004fd0| 65 2d 6e 6f 6e 64 69 72 | 65 63 74 6f 72 79 20 6e |e-nondir|ectory n|
|00004fe0| 69 6c 20 65 64 69 66 66 | 2d 6d 65 72 67 65 2d 66 |il ediff|-merge-f|
|00004ff0| 69 6c 65 73 20 6d 65 72 | 67 65 2d 62 75 66 66 65 |iles mer|ge-buffe|
|00005000| 72 2d 66 69 6c 65 5d 20 | 37 20 28 23 24 20 2e 20 |r-file] |7 (#$ . |
|00005010| 32 30 31 36 30 29 20 28 | 6c 65 74 20 28 28 64 69 |20160) (|let ((di|
|00005020| 72 2d 41 20 28 69 66 20 | 65 64 69 66 66 2d 75 73 |r-A (if |ediff-us|
|00005030| 65 2d 6c 61 73 74 2d 64 | 69 72 20 65 64 69 66 66 |e-last-d|ir ediff|
|00005040| 2d 6c 61 73 74 2d 64 69 | 72 2d 41 20 64 65 66 61 |-last-di|r-A defa|
|00005050| 75 6c 74 2d 64 69 72 65 | 63 74 6f 72 79 29 29 20 |ult-dire|ctory)) |
|00005060| 64 69 72 2d 42 20 66 29 | 20 28 6c 69 73 74 20 28 |dir-B f)| (list (|
|00005070| 73 65 74 71 20 66 20 28 | 65 64 69 66 66 2d 72 65 |setq f (|ediff-re|
|00005080| 61 64 2d 66 69 6c 65 2d | 6e 61 6d 65 20 22 46 69 |ad-file-|name "Fi|
|00005090| 6c 65 20 41 20 74 6f 20 | 6d 65 72 67 65 22 20 64 |le A to |merge" d|
|000050a0| 69 72 2d 41 20 28 65 64 | 69 66 66 2d 67 65 74 2d |ir-A (ed|iff-get-|
|000050b0| 64 65 66 61 75 6c 74 2d | 66 69 6c 65 2d 6e 61 6d |default-|file-nam|
|000050c0| 65 29 29 29 20 28 65 64 | 69 66 66 2d 72 65 61 64 |e))) (ed|iff-read|
|000050d0| 2d 66 69 6c 65 2d 6e 61 | 6d 65 20 22 46 69 6c 65 |-file-na|me "File|
|000050e0| 20 42 20 74 6f 20 6d 65 | 72 67 65 22 20 28 73 65 | B to me|rge" (se|
|000050f0| 74 71 20 64 69 72 2d 42 | 20 28 69 66 20 65 64 69 |tq dir-B| (if edi|
|00005100| 66 66 2d 75 73 65 2d 6c | 61 73 74 2d 64 69 72 20 |ff-use-l|ast-dir |
|00005110| 65 64 69 66 66 2d 6c 61 | 73 74 2d 64 69 72 2d 42 |ediff-la|st-dir-B|
|00005120| 20 28 66 69 6c 65 2d 6e | 61 6d 65 2d 64 69 72 65 | (file-n|ame-dire|
|00005130| 63 74 6f 72 79 20 66 29 | 29 29 20 28 70 72 6f 67 |ctory f)|)) (prog|
|00005140| 6e 20 28 73 65 74 71 20 | 66 69 6c 65 2d 6e 61 6d |n (setq |file-nam|
|00005150| 65 2d 68 69 73 74 6f 72 | 79 20 28 63 6f 6e 73 20 |e-histor|y (cons |
|00005160| 28 65 64 69 66 66 2d 61 | 62 62 72 65 76 69 61 74 |(ediff-a|bbreviat|
|00005170| 65 2d 66 69 6c 65 2d 6e | 61 6d 65 20 28 65 78 70 |e-file-n|ame (exp|
|00005180| 61 6e 64 2d 66 69 6c 65 | 2d 6e 61 6d 65 20 28 66 |and-file|-name (f|
|00005190| 69 6c 65 2d 6e 61 6d 65 | 2d 6e 6f 6e 64 69 72 65 |ile-name|-nondire|
|000051a0| 63 74 6f 72 79 20 66 29 | 20 64 69 72 2d 42 29 29 |ctory f)| dir-B))|
|000051b0| 20 66 69 6c 65 2d 6e 61 | 6d 65 2d 68 69 73 74 6f | file-na|me-histo|
|000051c0| 72 79 29 29 20 66 29 29 | 29 29 5d 29 0a 23 40 33 |ry)) f))|))]).#@3|
|000051d0| 32 20 4d 65 72 67 65 20 | 74 77 6f 20 66 69 6c 65 |2 Merge |two file|
|000051e0| 73 20 77 69 74 68 20 61 | 6e 63 65 73 74 6f 72 2e |s with a|ncestor.|
|000051f0| 1f 0a 28 64 65 66 61 6c | 69 61 73 20 27 65 64 69 |..(defal|ias 'edi|
|00005200| 66 66 2d 6d 65 72 67 65 | 2d 66 69 6c 65 73 2d 77 |ff-merge|-files-w|
|00005210| 69 74 68 2d 61 6e 63 65 | 73 74 6f 72 20 23 5b 28 |ith-ance|stor #[(|
|00005220| 66 69 6c 65 2d 41 20 66 | 69 6c 65 2d 42 20 66 69 |file-A f|ile-B fi|
|00005230| 6c 65 2d 61 6e 63 65 73 | 74 6f 72 20 26 6f 70 74 |le-ances|tor &opt|
|00005240| 69 6f 6e 61 6c 20 73 74 | 61 72 74 75 70 2d 68 6f |ional st|artup-ho|
|00005250| 6f 6b 73 20 6d 65 72 67 | 65 2d 62 75 66 66 65 72 |oks merg|e-buffer|
|00005260| 2d 66 69 6c 65 29 20 22 | c0 09 42 11 c2 0b c4 0d |-file) "|..B.....|
|00005270| 21 ab 88 c6 c7 0b 21 0d | 5c 22 aa 81 0d 0e 08 09 |!.....!.|\"......|
|00005280| c9 0e 5c 6e 26 06 87 22 | 20 5b 65 64 69 66 66 2d |..\n&.."| [ediff-|
|00005290| 6d 65 72 67 65 2d 6f 6e | 2d 73 74 61 72 74 75 70 |merge-on|-startup|
|000052a0| 20 73 74 61 72 74 75 70 | 2d 68 6f 6f 6b 73 20 65 | startup|-hooks e|
|000052b0| 64 69 66 66 2d 66 69 6c | 65 73 2d 69 6e 74 65 72 |diff-fil|es-inter|
|000052c0| 6e 61 6c 20 66 69 6c 65 | 2d 41 20 66 69 6c 65 2d |nal file|-A file-|
|000052d0| 64 69 72 65 63 74 6f 72 | 79 2d 70 20 66 69 6c 65 |director|y-p file|
|000052e0| 2d 42 20 65 78 70 61 6e | 64 2d 66 69 6c 65 2d 6e |-B expan|d-file-n|
|000052f0| 61 6d 65 20 66 69 6c 65 | 2d 6e 61 6d 65 2d 6e 6f |ame file|-name-no|
|00005300| 6e 64 69 72 65 63 74 6f | 72 79 20 66 69 6c 65 2d |ndirecto|ry file-|
|00005310| 61 6e 63 65 73 74 6f 72 | 20 65 64 69 66 66 2d 6d |ancestor| ediff-m|
|00005320| 65 72 67 65 2d 66 69 6c | 65 73 2d 77 69 74 68 2d |erge-fil|es-with-|
|00005330| 61 6e 63 65 73 74 6f 72 | 20 6d 65 72 67 65 2d 62 |ancestor| merge-b|
|00005340| 75 66 66 65 72 2d 66 69 | 6c 65 5d 20 37 20 28 23 |uffer-fi|le] 7 (#|
|00005350| 24 20 2e 20 32 30 39 34 | 36 29 20 28 6c 65 74 20 |$ . 2094|6) (let |
|00005360| 28 28 64 69 72 2d 41 20 | 28 69 66 20 65 64 69 66 |((dir-A |(if edif|
|00005370| 66 2d 75 73 65 2d 6c 61 | 73 74 2d 64 69 72 20 65 |f-use-la|st-dir e|
|00005380| 64 69 66 66 2d 6c 61 73 | 74 2d 64 69 72 2d 41 20 |diff-las|t-dir-A |
|00005390| 64 65 66 61 75 6c 74 2d | 64 69 72 65 63 74 6f 72 |default-|director|
|000053a0| 79 29 29 20 64 69 72 2d | 42 20 64 69 72 2d 61 6e |y)) dir-|B dir-an|
|000053b0| 63 65 73 74 6f 72 20 66 | 20 66 66 29 20 28 6c 69 |cestor f| ff) (li|
|000053c0| 73 74 20 28 73 65 74 71 | 20 66 20 28 65 64 69 66 |st (setq| f (edif|
|000053d0| 66 2d 72 65 61 64 2d 66 | 69 6c 65 2d 6e 61 6d 65 |f-read-f|ile-name|
|000053e0| 20 22 46 69 6c 65 20 41 | 20 74 6f 20 6d 65 72 67 | "File A| to merg|
|000053f0| 65 22 20 64 69 72 2d 41 | 20 28 65 64 69 66 66 2d |e" dir-A| (ediff-|
|00005400| 67 65 74 2d 64 65 66 61 | 75 6c 74 2d 66 69 6c 65 |get-defa|ult-file|
|00005410| 2d 6e 61 6d 65 29 29 29 | 20 28 73 65 74 71 20 66 |-name)))| (setq f|
|00005420| 66 20 28 65 64 69 66 66 | 2d 72 65 61 64 2d 66 69 |f (ediff|-read-fi|
|00005430| 6c 65 2d 6e 61 6d 65 20 | 22 46 69 6c 65 20 42 20 |le-name |"File B |
|00005440| 74 6f 20 6d 65 72 67 65 | 22 20 28 73 65 74 71 20 |to merge|" (setq |
|00005450| 64 69 72 2d 42 20 28 69 | 66 20 65 64 69 66 66 2d |dir-B (i|f ediff-|
|00005460| 75 73 65 2d 6c 61 73 74 | 2d 64 69 72 20 65 64 69 |use-last|-dir edi|
|00005470| 66 66 2d 6c 61 73 74 2d | 64 69 72 2d 42 20 28 66 |ff-last-|dir-B (f|
|00005480| 69 6c 65 2d 6e 61 6d 65 | 2d 64 69 72 65 63 74 6f |ile-name|-directo|
|00005490| 72 79 20 66 29 29 29 20 | 28 70 72 6f 67 6e 20 28 |ry f))) |(progn (|
|000054a0| 73 65 74 71 20 66 69 6c | 65 2d 6e 61 6d 65 2d 68 |setq fil|e-name-h|
|000054b0| 69 73 74 6f 72 79 20 28 | 63 6f 6e 73 20 28 65 64 |istory (|cons (ed|
|000054c0| 69 66 66 2d 61 62 62 72 | 65 76 69 61 74 65 2d 66 |iff-abbr|eviate-f|
|000054d0| 69 6c 65 2d 6e 61 6d 65 | 20 28 65 78 70 61 6e 64 |ile-name| (expand|
|000054e0| 2d 66 69 6c 65 2d 6e 61 | 6d 65 20 28 66 69 6c 65 |-file-na|me (file|
|000054f0| 2d 6e 61 6d 65 2d 6e 6f | 6e 64 69 72 65 63 74 6f |-name-no|ndirecto|
|00005500| 72 79 20 66 29 20 64 69 | 72 2d 42 29 29 20 66 69 |ry f) di|r-B)) fi|
|00005510| 6c 65 2d 6e 61 6d 65 2d | 68 69 73 74 6f 72 79 29 |le-name-|history)|
|00005520| 29 20 66 29 29 29 20 28 | 65 64 69 66 66 2d 72 65 |) f))) (|ediff-re|
|00005530| 61 64 2d 66 69 6c 65 2d | 6e 61 6d 65 20 22 41 6e |ad-file-|name "An|
|00005540| 63 65 73 74 6f 72 20 66 | 69 6c 65 22 20 28 73 65 |cestor f|ile" (se|
|00005550| 74 71 20 64 69 72 2d 61 | 6e 63 65 73 74 6f 72 20 |tq dir-a|ncestor |
|00005560| 28 69 66 20 65 64 69 66 | 66 2d 75 73 65 2d 6c 61 |(if edif|f-use-la|
|00005570| 73 74 2d 64 69 72 20 65 | 64 69 66 66 2d 6c 61 73 |st-dir e|diff-las|
|00005580| 74 2d 64 69 72 2d 61 6e | 63 65 73 74 6f 72 20 28 |t-dir-an|cestor (|
|00005590| 66 69 6c 65 2d 6e 61 6d | 65 2d 64 69 72 65 63 74 |file-nam|e-direct|
|000055a0| 6f 72 79 20 66 66 29 29 | 29 20 28 70 72 6f 67 6e |ory ff))|) (progn|
|000055b0| 20 28 73 65 74 71 20 66 | 69 6c 65 2d 6e 61 6d 65 | (setq f|ile-name|
|000055c0| 2d 68 69 73 74 6f 72 79 | 20 28 63 6f 6e 73 20 28 |-history| (cons (|
|000055d0| 65 64 69 66 66 2d 61 62 | 62 72 65 76 69 61 74 65 |ediff-ab|breviate|
|000055e0| 2d 66 69 6c 65 2d 6e 61 | 6d 65 20 28 65 78 70 61 |-file-na|me (expa|
|000055f0| 6e 64 2d 66 69 6c 65 2d | 6e 61 6d 65 20 28 66 69 |nd-file-|name (fi|
|00005600| 6c 65 2d 6e 61 6d 65 2d | 6e 6f 6e 64 69 72 65 63 |le-name-|nondirec|
|00005610| 74 6f 72 79 20 66 66 29 | 20 64 69 72 2d 61 6e 63 |tory ff)| dir-anc|
|00005620| 65 73 74 6f 72 29 29 20 | 66 69 6c 65 2d 6e 61 6d |estor)) |file-nam|
|00005630| 65 2d 68 69 73 74 6f 72 | 79 29 29 20 66 66 29 29 |e-histor|y)) ff))|
|00005640| 29 29 5d 29 0a 28 64 65 | 66 61 6c 69 61 73 20 27 |))]).(de|falias '|
|00005650| 65 64 69 66 66 2d 6d 65 | 72 67 65 2d 77 69 74 68 |ediff-me|rge-with|
|00005660| 2d 61 6e 63 65 73 74 6f | 72 20 27 65 64 69 66 66 |-ancesto|r 'ediff|
|00005670| 2d 6d 65 72 67 65 2d 66 | 69 6c 65 73 2d 77 69 74 |-merge-f|iles-wit|
|00005680| 68 2d 61 6e 63 65 73 74 | 6f 72 29 0a 23 40 33 33 |h-ancest|or).#@33|
|00005690| 20 4d 65 72 67 65 20 62 | 75 66 66 65 72 73 20 77 | Merge b|uffers w|
|000056a0| 69 74 68 6f 75 74 20 61 | 6e 63 65 73 74 6f 72 2e |ithout a|ncestor.|
|000056b0| 1f 0a 28 64 65 66 61 6c | 69 61 73 20 27 65 64 69 |..(defal|ias 'edi|
|000056c0| 66 66 2d 6d 65 72 67 65 | 2d 62 75 66 66 65 72 73 |ff-merge|-buffers|
|000056d0| 20 23 5b 28 62 75 66 66 | 65 72 2d 41 20 62 75 66 | #[(buff|er-A buf|
|000056e0| 66 65 72 2d 42 20 26 6f | 70 74 69 6f 6e 61 6c 20 |fer-B &o|ptional |
|000056f0| 73 74 61 72 74 75 70 2d | 68 6f 6f 6b 73 20 6a 6f |startup-|hooks jo|
|00005700| 62 2d 6e 61 6d 65 20 6d | 65 72 67 65 2d 62 75 66 |b-name m|erge-buf|
|00005710| 66 65 72 2d 66 69 6c 65 | 29 20 22 c0 09 42 11 5c |fer-file|) "..B.\|
|00005720| 6e ac 82 c3 12 c4 0d 0e | 06 c7 09 5c 6e 0e 08 26 |n.......|...\n..&|
|00005730| 06 87 22 20 5b 65 64 69 | 66 66 2d 6d 65 72 67 65 |.." [edi|ff-merge|
|00005740| 2d 6f 6e 2d 73 74 61 72 | 74 75 70 20 73 74 61 72 |-on-star|tup star|
|00005750| 74 75 70 2d 68 6f 6f 6b | 73 20 6a 6f 62 2d 6e 61 |tup-hook|s job-na|
|00005760| 6d 65 20 65 64 69 66 66 | 2d 6d 65 72 67 65 2d 62 |me ediff|-merge-b|
|00005770| 75 66 66 65 72 73 20 65 | 64 69 66 66 2d 62 75 66 |uffers e|diff-buf|
|00005780| 66 65 72 73 2d 69 6e 74 | 65 72 6e 61 6c 20 62 75 |fers-int|ernal bu|
|00005790| 66 66 65 72 2d 41 20 62 | 75 66 66 65 72 2d 42 20 |ffer-A b|uffer-B |
|000057a0| 6e 69 6c 20 6d 65 72 67 | 65 2d 62 75 66 66 65 72 |nil merg|e-buffer|
|000057b0| 2d 66 69 6c 65 5d 20 37 | 20 28 23 24 20 2e 20 32 |-file] 7| (#$ . 2|
|000057c0| 32 31 36 31 29 20 28 6c | 65 74 20 28 62 66 29 20 |2161) (l|et (bf) |
|000057d0| 28 6c 69 73 74 20 28 73 | 65 74 71 20 62 66 20 28 |(list (s|etq bf (|
|000057e0| 72 65 61 64 2d 62 75 66 | 66 65 72 20 22 42 75 66 |read-buf|fer "Buf|
|000057f0| 66 65 72 20 41 20 74 6f | 20 6d 65 72 67 65 3a 20 |fer A to| merge: |
|00005800| 22 20 28 65 64 69 66 66 | 2d 6f 74 68 65 72 2d 62 |" (ediff|-other-b|
|00005810| 75 66 66 65 72 20 22 22 | 29 20 74 29 29 20 28 72 |uffer ""|) t)) (r|
|00005820| 65 61 64 2d 62 75 66 66 | 65 72 20 22 42 75 66 66 |ead-buff|er "Buff|
|00005830| 65 72 20 42 20 74 6f 20 | 6d 65 72 67 65 3a 20 22 |er B to |merge: "|
|00005840| 20 28 70 72 6f 67 6e 20 | 28 73 61 76 65 2d 77 69 | (progn |(save-wi|
|00005850| 6e 64 6f 77 2d 65 78 63 | 75 72 73 69 6f 6e 20 28 |ndow-exc|ursion (|
|00005860| 6f 74 68 65 72 2d 77 69 | 6e 64 6f 77 20 31 29 29 |other-wi|ndow 1))|
|00005870| 20 28 65 64 69 66 66 2d | 6f 74 68 65 72 2d 62 75 | (ediff-|other-bu|
|00005880| 66 66 65 72 20 62 66 29 | 29 20 74 29 29 29 5d 29 |ffer bf)|) t)))])|
|00005890| 0a 23 40 33 30 20 4d 65 | 72 67 65 20 62 75 66 66 |.#@30 Me|rge buff|
|000058a0| 65 72 73 20 77 69 74 68 | 20 61 6e 63 65 73 74 6f |ers with| ancesto|
|000058b0| 72 2e 1f 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 |r...(def|alias 'e|
|000058c0| 64 69 66 66 2d 6d 65 72 | 67 65 2d 62 75 66 66 65 |diff-mer|ge-buffe|
|000058d0| 72 73 2d 77 69 74 68 2d | 61 6e 63 65 73 74 6f 72 |rs-with-|ancestor|
|000058e0| 20 23 5b 28 62 75 66 66 | 65 72 2d 41 20 62 75 66 | #[(buff|er-A buf|
|000058f0| 66 65 72 2d 42 20 62 75 | 66 66 65 72 2d 61 6e 63 |fer-B bu|ffer-anc|
|00005900| 65 73 74 6f 72 20 26 6f | 70 74 69 6f 6e 61 6c 20 |estor &o|ptional |
|00005910| 73 74 61 72 74 75 70 2d | 68 6f 6f 6b 73 20 6a 6f |startup-|hooks jo|
|00005920| 62 2d 6e 61 6d 65 20 6d | 65 72 67 65 2d 62 75 66 |b-name m|erge-buf|
|00005930| 66 65 72 2d 66 69 6c 65 | 29 20 22 c0 09 42 11 5c |fer-file|) "..B.\|
|00005940| 6e ac 82 c3 12 c4 0d 0e | 06 0e 07 09 5c 6e 0e 08 |n.......|....\n..|
|00005950| 26 06 87 22 20 5b 65 64 | 69 66 66 2d 6d 65 72 67 |&.." [ed|iff-merg|
|00005960| 65 2d 6f 6e 2d 73 74 61 | 72 74 75 70 20 73 74 61 |e-on-sta|rtup sta|
|00005970| 72 74 75 70 2d 68 6f 6f | 6b 73 20 6a 6f 62 2d 6e |rtup-hoo|ks job-n|
|00005980| 61 6d 65 20 65 64 69 66 | 66 2d 6d 65 72 67 65 2d |ame edif|f-merge-|
|00005990| 62 75 66 66 65 72 73 2d | 77 69 74 68 2d 61 6e 63 |buffers-|with-anc|
|000059a0| 65 73 74 6f 72 20 65 64 | 69 66 66 2d 62 75 66 66 |estor ed|iff-buff|
|000059b0| 65 72 73 2d 69 6e 74 65 | 72 6e 61 6c 20 62 75 66 |ers-inte|rnal buf|
|000059c0| 66 65 72 2d 41 20 62 75 | 66 66 65 72 2d 42 20 62 |fer-A bu|ffer-B b|
|000059d0| 75 66 66 65 72 2d 61 6e | 63 65 73 74 6f 72 20 6d |uffer-an|cestor m|
|000059e0| 65 72 67 65 2d 62 75 66 | 66 65 72 2d 66 69 6c 65 |erge-buf|fer-file|
|000059f0| 5d 20 37 20 28 23 24 20 | 2e 20 32 32 36 37 38 29 |] 7 (#$ |. 22678)|
|00005a00| 20 28 6c 65 74 20 28 62 | 66 20 62 66 66 29 20 28 | (let (b|f bff) (|
|00005a10| 6c 69 73 74 20 28 73 65 | 74 71 20 62 66 20 28 72 |list (se|tq bf (r|
|00005a20| 65 61 64 2d 62 75 66 66 | 65 72 20 22 42 75 66 66 |ead-buff|er "Buff|
|00005a30| 65 72 20 41 20 74 6f 20 | 6d 65 72 67 65 3a 20 22 |er A to |merge: "|
|00005a40| 20 28 65 64 69 66 66 2d | 6f 74 68 65 72 2d 62 75 | (ediff-|other-bu|
|00005a50| 66 66 65 72 20 22 22 29 | 20 74 29 29 20 28 73 65 |ffer "")| t)) (se|
|00005a60| 74 71 20 62 66 66 20 28 | 72 65 61 64 2d 62 75 66 |tq bff (|read-buf|
|00005a70| 66 65 72 20 22 42 75 66 | 66 65 72 20 42 20 74 6f |fer "Buf|fer B to|
|00005a80| 20 6d 65 72 67 65 3a 20 | 22 20 28 70 72 6f 67 6e | merge: |" (progn|
|00005a90| 20 28 73 61 76 65 2d 77 | 69 6e 64 6f 77 2d 65 78 | (save-w|indow-ex|
|00005aa0| 63 75 72 73 69 6f 6e 20 | 28 6f 74 68 65 72 2d 77 |cursion |(other-w|
|00005ab0| 69 6e 64 6f 77 20 31 29 | 29 20 28 65 64 69 66 66 |indow 1)|) (ediff|
|00005ac0| 2d 6f 74 68 65 72 2d 62 | 75 66 66 65 72 20 62 66 |-other-b|uffer bf|
|00005ad0| 29 29 20 74 29 29 20 28 | 72 65 61 64 2d 62 75 66 |)) t)) (|read-buf|
|00005ae0| 66 65 72 20 22 41 6e 63 | 65 73 74 6f 72 20 62 75 |fer "Anc|estor bu|
|00005af0| 66 66 65 72 3a 20 22 20 | 28 70 72 6f 67 6e 20 28 |ffer: " |(progn (|
|00005b00| 73 61 76 65 2d 77 69 6e | 64 6f 77 2d 65 78 63 75 |save-win|dow-excu|
|00005b10| 72 73 69 6f 6e 20 28 6f | 74 68 65 72 2d 77 69 6e |rsion (o|ther-win|
|00005b20| 64 6f 77 20 31 29 29 20 | 28 65 64 69 66 66 2d 6f |dow 1)) |(ediff-o|
|00005b30| 74 68 65 72 2d 62 75 66 | 66 65 72 20 28 6c 69 73 |ther-buf|fer (lis|
|00005b40| 74 20 62 66 20 62 66 66 | 29 29 29 20 74 29 29 29 |t bf bff|))) t)))|
|00005b50| 5d 29 0a 23 40 31 32 39 | 20 52 75 6e 20 45 64 69 |]).#@129| Run Edi|
|00005b60| 66 66 20 62 79 20 6d 65 | 72 67 69 6e 67 20 74 77 |ff by me|rging tw|
|00005b70| 6f 20 72 65 76 69 73 69 | 6f 6e 73 20 6f 66 20 61 |o revisi|ons of a|
|00005b80| 20 66 69 6c 65 2e 0a 54 | 68 65 20 66 69 6c 65 20 | file..T|he file |
|00005b90| 69 73 20 74 68 65 20 6f | 70 74 69 6f 6e 61 6c 20 |is the o|ptional |
|00005ba0| 46 49 4c 45 20 61 72 67 | 75 6d 65 6e 74 20 6f 72 |FILE arg|ument or|
|00005bb0| 20 74 68 65 20 66 69 6c | 65 20 76 69 73 69 74 65 | the fil|e visite|
|00005bc0| 64 20 62 79 20 74 68 65 | 20 63 75 72 72 65 6e 74 |d by the| current|
|00005bd0| 0a 62 75 66 66 65 72 2e | 1f 0a 28 64 65 66 61 6c |.buffer.|..(defal|
|00005be0| 69 61 73 20 27 65 64 69 | 66 66 2d 6d 65 72 67 65 |ias 'edi|ff-merge|
|00005bf0| 2d 72 65 76 69 73 69 6f | 6e 73 20 23 5b 28 26 6f |-revisio|ns #[(&o|
|00005c00| 70 74 69 6f 6e 61 6c 20 | 66 69 6c 65 20 73 74 61 |ptional |file sta|
|00005c10| 72 74 75 70 2d 68 6f 6f | 6b 73 20 6d 65 72 67 65 |rtup-hoo|ks merge|
|00005c20| 2d 62 75 66 66 65 72 2d | 66 69 6c 65 29 20 22 08 |-buffer-|file) ".|
|00005c30| 3b ab 84 c1 08 21 88 c2 | 89 1b 1c c5 c6 c7 08 3b |;....!..|.......;|
|00005c40| ab 85 c8 08 21 aa 81 c9 | 5c 22 21 14 c5 c6 ca 08 |....!...|\"!.....|
|00005c50| 3b ab 85 c8 08 21 aa 81 | c9 5c 22 21 13 cb 20 88 |;....!..|.\"!.. .|
|00005c60| cc c6 cd 0e 0e 5c 22 21 | 0c 0b c2 0e 0f 0e 10 25 |.....\"!|.......%|
|00005c70| 2a 87 22 20 5b 66 69 6c | 65 20 66 69 6e 64 2d 66 |*." [fil|e find-f|
|00005c80| 69 6c 65 20 6e 69 6c 20 | 72 65 76 32 20 72 65 76 |ile nil |rev2 rev|
|00005c90| 31 20 72 65 61 64 2d 73 | 74 72 69 6e 67 20 66 6f |1 read-s|tring fo|
|00005ca0| 72 6d 61 74 20 22 56 65 | 72 73 69 6f 6e 20 31 20 |rmat "Ve|rsion 1 |
|00005cb0| 74 6f 20 6d 65 72 67 65 | 20 28 64 65 66 61 75 6c |to merge| (defaul|
|00005cc0| 74 3a 20 25 73 27 73 20 | 6c 61 74 65 73 74 20 76 |t: %s's |latest v|
|00005cd0| 65 72 73 69 6f 6e 29 3a | 20 22 20 66 69 6c 65 2d |ersion):| " file-|
|00005ce0| 6e 61 6d 65 2d 6e 6f 6e | 64 69 72 65 63 74 6f 72 |name-non|director|
|00005cf0| 79 20 22 63 75 72 72 65 | 6e 74 20 62 75 66 66 65 |y "curre|nt buffe|
|00005d00| 72 22 20 22 56 65 72 73 | 69 6f 6e 20 32 20 74 6f |r" "Vers|ion 2 to|
|00005d10| 20 6d 65 72 67 65 20 28 | 64 65 66 61 75 6c 74 3a | merge (|default:|
|00005d20| 20 25 73 29 3a 20 22 20 | 65 64 69 66 66 2d 6c 6f | %s): " |ediff-lo|
|00005d30| 61 64 2d 76 65 72 73 69 | 6f 6e 2d 63 6f 6e 74 72 |ad-versi|on-contr|
|00005d40| 6f 6c 20 69 6e 74 65 72 | 6e 20 22 65 64 69 66 66 |ol inter|n "ediff|
|00005d50| 2d 25 53 2d 6d 65 72 67 | 65 2d 69 6e 74 65 72 6e |-%S-merg|e-intern|
|00005d60| 61 6c 22 20 65 64 69 66 | 66 2d 76 65 72 73 69 6f |al" edif|f-versio|
|00005d70| 6e 2d 63 6f 6e 74 72 6f | 6c 2d 70 61 63 6b 61 67 |n-contro|l-packag|
|00005d80| 65 20 73 74 61 72 74 75 | 70 2d 68 6f 6f 6b 73 20 |e startu|p-hooks |
|00005d90| 6d 65 72 67 65 2d 62 75 | 66 66 65 72 2d 66 69 6c |merge-bu|ffer-fil|
|00005da0| 65 5d 20 36 20 28 23 24 | 20 2e 20 32 33 33 38 35 |e] 6 (#$| . 23385|
|00005db0| 29 20 6e 69 6c 5d 29 0a | 23 40 31 35 36 20 52 75 |) nil]).|#@156 Ru|
|00005dc0| 6e 20 45 64 69 66 66 20 | 62 79 20 6d 65 72 67 69 |n Ediff |by mergi|
|00005dd0| 6e 67 20 74 77 6f 20 72 | 65 76 69 73 69 6f 6e 73 |ng two r|evisions|
|00005de0| 20 6f 66 20 61 20 66 69 | 6c 65 20 77 69 74 68 20 | of a fi|le with |
|00005df0| 61 20 63 6f 6d 6d 6f 6e | 20 61 6e 63 65 73 74 6f |a common| ancesto|
|00005e00| 72 2e 0a 54 68 65 20 66 | 69 6c 65 20 69 73 20 74 |r..The f|ile is t|
|00005e10| 68 65 20 74 68 65 20 6f | 70 74 69 6f 6e 61 6c 20 |he the o|ptional |
|00005e20| 46 49 4c 45 20 61 72 67 | 75 6d 65 6e 74 20 6f 72 |FILE arg|ument or|
|00005e30| 20 74 68 65 20 66 69 6c | 65 20 76 69 73 69 74 65 | the fil|e visite|
|00005e40| 64 20 62 79 20 74 68 65 | 20 63 75 72 72 65 6e 74 |d by the| current|
|00005e50| 0a 62 75 66 66 65 72 2e | 1f 0a 28 64 65 66 61 6c |.buffer.|..(defal|
|00005e60| 69 61 73 20 27 65 64 69 | 66 66 2d 6d 65 72 67 65 |ias 'edi|ff-merge|
|00005e70| 2d 72 65 76 69 73 69 6f | 6e 73 2d 77 69 74 68 2d |-revisio|ns-with-|
|00005e80| 61 6e 63 65 73 74 6f 72 | 20 23 5b 28 26 6f 70 74 |ancestor| #[(&opt|
|00005e90| 69 6f 6e 61 6c 20 66 69 | 6c 65 20 73 74 61 72 74 |ional fi|le start|
|00005ea0| 75 70 2d 68 6f 6f 6b 73 | 20 6d 65 72 67 65 2d 62 |up-hooks| merge-b|
|00005eb0| 75 66 66 65 72 2d 66 69 | 6c 65 29 20 22 08 3b ab |uffer-fi|le) ".;.|
|00005ec0| 84 c1 08 21 88 c2 89 89 | 1b 1c 1d c6 c7 c8 08 3b |...!....|.......;|
|00005ed0| ab 85 c9 08 21 aa 81 ca | 5c 22 21 15 c6 c7 cb 08 |....!...|\"!.....|
|00005ee0| 3b ab 85 c9 08 21 aa 81 | ca 5c 22 21 14 c6 c7 cc |;....!..|.\"!....|
|00005ef0| 08 3b ab 85 c9 08 21 aa | 81 ca 5c 22 21 13 cd 20 |.;....!.|..\"!.. |
|00005f00| 88 ce c7 cf 0e 10 5c 22 | 21 0d 0c 0b 0e 11 0e 12 |......\"|!.......|
|00005f10| 25 2b 87 22 20 5b 66 69 | 6c 65 20 66 69 6e 64 2d |%+." [fi|le find-|
|00005f20| 66 69 6c 65 20 6e 69 6c | 20 61 6e 63 65 73 74 6f |file nil| ancesto|
|00005f30| 72 2d 72 65 76 20 72 65 | 76 32 20 72 65 76 31 20 |r-rev re|v2 rev1 |
|00005f40| 72 65 61 64 2d 73 74 72 | 69 6e 67 20 66 6f 72 6d |read-str|ing form|
|00005f50| 61 74 20 22 56 65 72 73 | 69 6f 6e 20 31 20 74 6f |at "Vers|ion 1 to|
|00005f60| 20 6d 65 72 67 65 20 28 | 64 65 66 61 75 6c 74 3a | merge (|default:|
|00005f70| 20 25 73 27 73 20 6c 61 | 74 65 73 74 20 76 65 72 | %s's la|test ver|
|00005f80| 73 69 6f 6e 29 3a 20 22 | 20 66 69 6c 65 2d 6e 61 |sion): "| file-na|
|00005f90| 6d 65 2d 6e 6f 6e 64 69 | 72 65 63 74 6f 72 79 20 |me-nondi|rectory |
|00005fa0| 22 63 75 72 72 65 6e 74 | 20 62 75 66 66 65 72 22 |"current| buffer"|
|00005fb0| 20 22 56 65 72 73 69 6f | 6e 20 32 20 74 6f 20 6d | "Versio|n 2 to m|
|00005fc0| 65 72 67 65 20 28 64 65 | 66 61 75 6c 74 3a 20 25 |erge (de|fault: %|
|00005fd0| 73 29 3a 20 22 20 22 41 | 6e 63 65 73 74 6f 72 20 |s): " "A|ncestor |
|00005fe0| 76 65 72 73 69 6f 6e 20 | 28 64 65 66 61 75 6c 74 |version |(default|
|00005ff0| 3a 20 25 73 29 3a 20 22 | 20 65 64 69 66 66 2d 6c |: %s): "| ediff-l|
|00006000| 6f 61 64 2d 76 65 72 73 | 69 6f 6e 2d 63 6f 6e 74 |oad-vers|ion-cont|
|00006010| 72 6f 6c 20 69 6e 74 65 | 72 6e 20 22 65 64 69 66 |rol inte|rn "edif|
|00006020| 66 2d 25 53 2d 6d 65 72 | 67 65 2d 69 6e 74 65 72 |f-%S-mer|ge-inter|
|00006030| 6e 61 6c 22 20 65 64 69 | 66 66 2d 76 65 72 73 69 |nal" edi|ff-versi|
|00006040| 6f 6e 2d 63 6f 6e 74 72 | 6f 6c 2d 70 61 63 6b 61 |on-contr|ol-packa|
|00006050| 67 65 20 73 74 61 72 74 | 75 70 2d 68 6f 6f 6b 73 |ge start|up-hooks|
|00006060| 20 6d 65 72 67 65 2d 62 | 75 66 66 65 72 2d 66 69 | merge-b|uffer-fi|
|00006070| 6c 65 5d 20 36 20 28 23 | 24 20 2e 20 32 33 39 39 |le] 6 (#|$ . 2399|
|00006080| 38 29 20 6e 69 6c 5d 29 | 0a 23 40 31 39 30 20 52 |8) nil])|.#@190 R|
|00006090| 75 6e 20 45 64 69 66 66 | 2d 6d 65 72 67 65 20 6f |un Ediff|-merge o|
|000060a0| 6e 20 61 70 70 72 6f 70 | 72 69 61 74 65 20 72 65 |n approp|riate re|
|000060b0| 76 69 73 69 6f 6e 73 20 | 6f 66 20 74 68 65 20 73 |visions |of the s|
|000060c0| 65 6c 65 63 74 65 64 20 | 66 69 6c 65 2e 0a 46 69 |elected |file..Fi|
|000060d0| 72 73 74 20 72 75 6e 20 | 61 66 74 65 72 20 60 4d |rst run |after `M|
|000060e0| 2d 78 20 63 76 73 2d 75 | 70 64 61 74 65 27 2e 20 |-x cvs-u|pdate'. |
|000060f0| 54 68 65 6e 20 70 6c 61 | 63 65 20 74 68 65 20 63 |Then pla|ce the c|
|00006100| 75 72 73 6f 72 20 6f 6e | 20 61 20 6c 69 6e 65 20 |ursor on| a line |
|00006110| 64 65 73 63 72 69 62 69 | 6e 67 20 61 0a 66 69 6c |describi|ng a.fil|
|00006120| 65 20 61 6e 64 20 74 68 | 65 6e 20 72 75 6e 20 60 |e and th|en run `|
|00006130| 72 75 6e 2d 65 64 69 66 | 66 2d 66 72 6f 6d 2d 63 |run-edif|f-from-c|
|00006140| 76 73 2d 62 75 66 66 65 | 72 27 2e 1f 0a 28 64 65 |vs-buffe|r'...(de|
|00006150| 66 61 6c 69 61 73 20 27 | 72 75 6e 2d 65 64 69 66 |falias '|run-edif|
|00006160| 66 2d 66 72 6f 6d 2d 63 | 76 73 2d 62 75 66 66 65 |f-from-c|vs-buffe|
|00006170| 72 20 23 5b 28 70 6f 73 | 29 20 22 c0 20 88 c1 5c |r #[(pos|) ". ..\|
|00006180| 6e 0b 5c 22 89 1c ab 85 | c5 0c 21 aa 83 c6 c7 21 |n.\"....|..!....!|
|00006190| 29 87 22 20 5b 65 64 69 | 66 66 2d 6c 6f 61 64 2d |)." [edi|ff-load-|
|000061a0| 76 65 72 73 69 6f 6e 2d | 63 6f 6e 74 72 6f 6c 20 |version-|control |
|000061b0| 74 69 6e 2d 6c 6f 63 61 | 74 65 20 63 76 73 2d 63 |tin-loca|te cvs-c|
|000061c0| 6f 6f 6b 69 65 2d 68 61 | 6e 64 6c 65 20 70 6f 73 |ookie-ha|ndle pos|
|000061d0| 20 74 69 6e 20 63 76 73 | 2d 72 75 6e 2d 65 64 69 | tin cvs|-run-edi|
|000061e0| 66 66 2d 6f 6e 2d 66 69 | 6c 65 2d 64 65 73 63 72 |ff-on-fi|le-descr|
|000061f0| 69 70 74 6f 72 20 65 72 | 72 6f 72 20 22 54 68 65 |iptor er|ror "The|
|00006200| 72 65 20 69 73 20 6e 6f | 20 66 69 6c 65 20 74 6f |re is no| file to|
|00006210| 20 6d 65 72 67 65 22 5d | 20 34 20 28 23 24 20 2e | merge"]| 4 (#$ .|
|00006220| 20 32 34 37 31 39 29 20 | 22 64 22 5d 29 0a 23 40 | 24719) |"d"]).#@|
|00006230| 34 30 20 52 75 6e 20 45 | 64 69 66 66 20 62 79 20 |40 Run E|diff by |
|00006240| 70 61 74 63 68 69 6e 67 | 20 53 4f 55 52 43 45 2d |patching| SOURCE-|
|00006250| 46 49 4c 45 4e 41 4d 45 | 2e 1f 0a 28 64 65 66 61 |FILENAME|...(defa|
|00006260| 6c 69 61 73 20 27 65 64 | 69 66 66 2d 70 61 74 63 |lias 'ed|iff-patc|
|00006270| 68 2d 66 69 6c 65 20 23 | 5b 6e 69 6c 20 22 c0 89 |h-file #|[nil "..|
|00006280| 89 19 1a 1b c4 c5 21 88 | c6 20 11 0e 07 ab 84 0e |......!.|. ......|
|00006290| 08 aa 94 0e 09 ac 8e ca | 09 21 ab 89 cb cc ca 09 |........|.!......|
|000062a0| 21 21 21 aa 82 0e 0d 13 | ce cf 0b d0 20 23 12 d1 |!!!.....|.... #..|
|000062b0| 09 5c 6e 5c 22 2b 87 22 | 20 5b 6e 69 6c 20 70 61 |.\n\"+."| [nil pa|
|000062c0| 74 63 68 2d 62 75 66 20 | 73 6f 75 72 63 65 2d 66 |tch-buf |source-f|
|000062d0| 69 6c 65 20 73 6f 75 72 | 63 65 2d 64 69 72 20 72 |ile sour|ce-dir r|
|000062e0| 65 71 75 69 72 65 20 65 | 64 69 66 66 2d 70 74 63 |equire e|diff-ptc|
|000062f0| 68 20 65 64 69 66 66 2d | 67 65 74 2d 70 61 74 63 |h ediff-|get-patc|
|00006300| 68 2d 62 75 66 66 65 72 | 20 65 64 69 66 66 2d 75 |h-buffer| ediff-u|
|00006310| 73 65 2d 6c 61 73 74 2d | 64 69 72 20 65 64 69 66 |se-last-|dir edif|
|00006320| 66 2d 6c 61 73 74 2d 64 | 69 72 2d 70 61 74 63 68 |f-last-d|ir-patch|
|00006330| 20 65 64 69 66 66 2d 70 | 61 74 63 68 2d 64 65 66 | ediff-p|atch-def|
|00006340| 61 75 6c 74 2d 64 69 72 | 65 63 74 6f 72 79 20 62 |ault-dir|ectory b|
|00006350| 75 66 66 65 72 2d 66 69 | 6c 65 2d 6e 61 6d 65 20 |uffer-fi|le-name |
|00006360| 66 69 6c 65 2d 6e 61 6d | 65 2d 64 69 72 65 63 74 |file-nam|e-direct|
|00006370| 6f 72 79 20 65 78 70 61 | 6e 64 2d 66 69 6c 65 2d |ory expa|nd-file-|
|00006380| 6e 61 6d 65 20 64 65 66 | 61 75 6c 74 2d 64 69 72 |name def|ault-dir|
|00006390| 65 63 74 6f 72 79 20 65 | 64 69 66 66 2d 72 65 61 |ectory e|diff-rea|
|000063a0| 64 2d 66 69 6c 65 2d 6e | 61 6d 65 20 22 57 68 69 |d-file-n|ame "Whi|
|000063b0| 63 68 20 66 69 6c 65 20 | 74 6f 20 70 61 74 63 68 |ch file |to patch|
|000063c0| 3f 20 22 20 65 64 69 66 | 66 2d 67 65 74 2d 64 65 |? " edif|f-get-de|
|000063d0| 66 61 75 6c 74 2d 66 69 | 6c 65 2d 6e 61 6d 65 20 |fault-fi|le-name |
|000063e0| 65 64 69 66 66 2d 64 69 | 73 70 61 74 63 68 2d 66 |ediff-di|spatch-f|
|000063f0| 69 6c 65 2d 70 61 74 63 | 68 69 6e 67 2d 6a 6f 62 |ile-patc|hing-job|
+--------+-------------------------+-------------------------+--------+--------+
Only 25.0 KB of data is shown above.
